From ad483a2d1c25f2f986eedbdadf4dbf1f24d0c532 Mon Sep 17 00:00:00 2001 From: chai Date: Sun, 22 Jul 2018 15:25:01 +0800 Subject: *singleton --- src/libjin/audio/sdl/audio.h | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'src/libjin/audio/sdl/audio.h') diff --git a/src/libjin/audio/sdl/audio.h b/src/libjin/audio/sdl/audio.h index 6e42690..953a853 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 + class SDLAudio : public Audio { public: @@ -25,11 +25,6 @@ namespace audio int samples; // »º³åÇøµÄsampleÊý£¬<=samplerate }; - static inline Audio* get() - { - return audio != NULL ? audio : (audio = new SDLAudio()); - } - /* IAudio interface */ void play() override; void stop() override; @@ -50,11 +45,8 @@ namespace audio private: - SDLAudio() {} - ~SDLAudio() {} - - onlyonce bool _init(const SettingBase* setting) override; - onlyonce void _quit() override; + onlyonce bool initSystem(const SettingBase* setting) override; + onlyonce void quitSystem() override; unsigned int audioDevice; -- cgit v1.1-26-g67d0