更新音频模块

5 files changed, 21 insertions, 37 deletions

diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h
index 81f933b..4c8b35b 100644
--- a/src/libjin/audio/audio.h
+++ b/src/libjin/audio/audio.h
@@ -12,10 +12,13 @@ namespace audio
 {
     class Source;
     
-    class IAudio
+    class Audio : public Subsystem
     {
 
     public:
+        
+        Audio() {};
+        virtual ~Audio() {};
 
         virtual void play() = 0;
         virtual void stop() = 0;
@@ -27,16 +30,6 @@ namespace audio
         virtual void setVolume(float volume) = 0;
         virtual float getVolume() = 0;
 
-    };
-
-    class Audio : public Subsystem, implement IAudio
-    {
-
-    public:
-        
-        Audio() {};
-        virtual ~Audio() {};
-
         bool init(const SettingBase* setting) override;
         void quit() override;
 
diff --git a/src/libjin/audio/sdl/source.cpp b/src/libjin/audio/sdl/source.cpp
index 69c0670..2bb63f5 100644
--- a/src/libjin/audio/sdl/source.cpp
+++ b/src/libjin/audio/sdl/source.cpp
@@ -17,17 +17,16 @@ namespace audio
     {
         typedef enum Action
         {
-            Nothing = 0, //
-            Play,        // ��ͷ��ʼ
-            Stop,        // ֹͣ
-            Pause,       //
-            Resume,      //
-            Rewind,      //
-            SetVolume,   //
-            SetLoop,     //
-            SetRate,     //
+            Nothing = 0, 
+            Play,        
+            Stop,        
+            Pause,       
+            Resume,      
+            Rewind,      
+            SetVolume,   
+            SetLoop,     
+            SetRate,     
         };
-
         Action action;
         union {
             int _integer;
diff --git a/src/libjin/audio/source.h b/src/libjin/audio/source.h
index 10756a0..ea82725 100644
--- a/src/libjin/audio/source.h
+++ b/src/libjin/audio/source.h
@@ -14,11 +14,15 @@ namespace audio
         OGG,
     };
 
-    class ISource
+    class Source
     {
 
-    public: 
+    public:
+
+        Source() {};
+        virtual ~Source() {};
 
+        /* interface */
         virtual void play() = 0;
         virtual void stop() = 0;
         virtual void pause() = 0;
@@ -31,18 +35,6 @@ namespace audio
         virtual bool setLoop(bool loop) = 0;
         virtual void setRate(float rate) = 0;
 
-    };
-
-    class Source : public ISource 
-    {
-
-    public:
-
-        Source() {};
-        virtual ~Source() {};
-
-        /* ISource interface */
-
     protected: 
 
     };
diff --git a/src/libjin/render/jsl.cpp b/src/libjin/render/jsl.cpp
index f4e1cb0..66c4551 100644
--- a/src/libjin/render/jsl.cpp
+++ b/src/libjin/render/jsl.cpp
@@ -6,7 +6,7 @@ namespace render
 {
     //vec4 effect(vec4 color, Image texture, vec2 texture_coords, vec2 screen_coords) 
     static const char* base_f = " "
-        "#version 120             \n"
+        //"#version 120             \n"
         "#define number float     \n"
         "#define Image sampler2D  \n"
         "#define Canvas sampler2D \n"
diff --git a/src/libjin/utils/utils.h b/src/libjin/utils/utils.h
index 9073d59..cf0920e 100644
--- a/src/libjin/utils/utils.h
+++ b/src/libjin/utils/utils.h
@@ -4,6 +4,6 @@
 #include "macros.h"
 #include "endian.h"
 
-#define UNITTEST 1
+#define UNITTEST 0
 
 #endif
\ No newline at end of file