diff options
Diffstat (limited to 'src/libjin/Audio')
| -rw-r--r-- | src/libjin/Audio/Audio.h | 10 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLAudio.cpp | 4 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLAudio.h | 6 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/SDLSource.cpp | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/src/libjin/Audio/Audio.h b/src/libjin/Audio/Audio.h index 60de66d..5b43729 100644 --- a/src/libjin/Audio/Audio.h +++ b/src/libjin/Audio/Audio.h @@ -14,8 +14,8 @@ namespace audio { class Source; - template<class SubAudioSystem> - class AudioSystem : public Subsystem<SubAudioSystem> + template<class SubAudio> + class Audio : public Subsystem<SubAudio> { public: @@ -32,10 +32,10 @@ namespace audio protected: - AudioSystem() {}; - virtual ~AudioSystem() {}; + Audio() {}; + virtual ~Audio() {}; - SINGLETON(AudioSystem); + SINGLETON(Audio); }; 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(); |