From 52693d68f7181d707e1a192d67a617145b358394 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Sat, 28 Jul 2018 22:10:27 +0800
Subject: *update

---
 src/libjin/Audio/SDL/SDLAudio.cpp  | 4 +++-
 src/libjin/Audio/SDL/SDLAudio.h    | 6 +++---
 src/libjin/Audio/SDL/SDLSource.cpp | 4 +++-
 3 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'src/libjin/Audio/SDL')

diff --git a/src/libjin/Audio/SDL/SDLAudio.cpp b/src/libjin/Audio/SDL/SDLAudio.cpp
index c154ae4..a41382b 100644
--- a/src/libjin/Audio/SDL/SDLAudio.cpp
+++ b/src/libjin/Audio/SDL/SDLAudio.cpp
@@ -12,6 +12,8 @@ namespace jin
 namespace audio
 {
 
+    using namespace jin::math;
+
     /* 注意callback是在音频线程调用 */
     static void defaultCallback(void *userdata, Uint8 *stream, int size)
     {
@@ -34,7 +36,7 @@ namespace audio
             return false;
 
         unsigned int samplerate = setting->samplerate;
-        unsigned int samples = clamp(setting->samples, 1, setting->samplerate);
+        unsigned int samples = clamp<int>(setting->samples, 1, setting->samplerate);
 
         spec.freq     = samplerate;        // 每秒采样的sample数,常用的有 11025, 22050, 44100 and 48000 Hz. 
         spec.format   = AUDIO_S16SYS;      // signed 16-bit samples in native byte order
diff --git a/src/libjin/Audio/SDL/SDLAudio.h b/src/libjin/Audio/SDL/SDLAudio.h
index bac4544..6837126 100644
--- a/src/libjin/Audio/SDL/SDLAudio.h
+++ b/src/libjin/Audio/SDL/SDLAudio.h
@@ -15,7 +15,7 @@ namespace audio
 #define SDLAUDIO_BYTEDEPTH (SDLAUDIO_BITDEPTH  >> 3)
 #define SDLAUDIO_CHANNELS  2
 
-    class SDLAudio : public AudioSystem<SDLAudio>
+    class SDLAudio : public Audio<SDLAudio>
     {
 
     public:
@@ -52,8 +52,8 @@ namespace audio
         
         SINGLETON(SDLAudio);
 
-        onlyonce bool initSystem(const SettingBase* setting) override;
-        onlyonce void quitSystem() override;
+        bool initSystem(const SettingBase* setting) override;
+        void quitSystem() override;
 
         unsigned int audioDevice;
 
diff --git a/src/libjin/Audio/SDL/SDLSource.cpp b/src/libjin/Audio/SDL/SDLSource.cpp
index b70230d..18ba855 100644
--- a/src/libjin/Audio/SDL/SDLSource.cpp
+++ b/src/libjin/Audio/SDL/SDLSource.cpp
@@ -18,6 +18,8 @@ namespace jin
 namespace audio
 {
 
+    using namespace jin::math;
+
 #define BITS 8
 
     typedef struct SDLSourceCommand
@@ -134,7 +136,7 @@ namespace audio
             raw.samplerate = wav.samplerate;
             raw.bitdepth   = wav.bitdepth;
             raw.samples    = raw.length / (wav.bitdepth / 8.f) / wav.channels;
-            raw.channels   = clamp(wav.channels, CHANNEL::MONO, CHANNEL::STEREO);
+            raw.channels   = clamp<int>(wav.channels, CHANNEL::MONO, CHANNEL::STEREO);
         }
         else
             throw SourceException();
-- 
cgit v1.1-26-g67d0