2 files changed, 11 insertions, 5 deletions
diff --git a/src/libjin/audio/audio.h b/src/libjin/audio/audio.h
index ccfc8a1..7b27e1f 100644
--- a/src/libjin/audio/audio.h
+++ b/src/libjin/audio/audio.h
@@ -12,8 +12,7 @@ namespace audio
 {
     class Source;
     
-    template<class T>
-    class Audio : public Subsystem<T>
+    class AudioSystem : public Subsystem<AudioSystem>
     {
 
     public:
@@ -30,8 +29,10 @@ namespace audio
 
     protected:
 
-        Audio() {};
-        virtual ~Audio() {};
+        AudioSystem() {};
+        virtual ~AudioSystem() {};
+
+        SINGLETON(AudioSystem);
 
     };
 
diff --git a/src/libjin/audio/sdl/audio.h b/src/libjin/audio/sdl/audio.h
index 953a853..861acb3 100644
--- a/src/libjin/audio/sdl/audio.h
+++ b/src/libjin/audio/sdl/audio.h
@@ -13,7 +13,7 @@ namespace audio
 #define SDLAUDIO_BYTEDEPTH (SDLAUDIO_BITDEPTH  >> 3)
 #define SDLAUDIO_CHANNELS  2
 
-    class SDLAudio : public Audio<SDLAudio>
+    class SDLAudio : public AudioSystem
     {
 
     public:
@@ -45,6 +45,11 @@ namespace audio
 
     private:
 
+        SDLAudio() {};
+        ~SDLAudio() {};
+        
+        SINGLETON(SDLAudio);
+
         onlyonce bool initSystem(const SettingBase* setting) override;
         onlyonce void quitSystem() override;