From 4486beab7beb6a80ba6a89bfa73c0fbc9708ca74 Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 6 Dec 2018 17:26:07 +0800 Subject: *singleton --- src/libjin/audio/SDL/je_sdl_audio.cpp | 2 +- src/libjin/audio/SDL/je_sdl_audio.h | 24 +++++++++++------------- src/libjin/audio/je_audio_manager.h | 28 +++++++++++++--------------- 3 files changed, 25 insertions(+), 29 deletions(-) (limited to 'src/libjin/audio') diff --git a/src/libjin/audio/SDL/je_sdl_audio.cpp b/src/libjin/audio/SDL/je_sdl_audio.cpp index c21d077..b89e8d3 100644 --- a/src/libjin/audio/SDL/je_sdl_audio.cpp +++ b/src/libjin/audio/SDL/je_sdl_audio.cpp @@ -31,7 +31,7 @@ namespace JinEngine audio->unlock(); } - /*call only once*/ bool SDLAudio::initSystem(const SettingBase* s) + /*call only once*/ bool SDLAudio::startSystem(const SettingBase* s) { jin_log_info("Initialize audio system."); diff --git a/src/libjin/audio/SDL/je_sdl_audio.h b/src/libjin/audio/SDL/je_sdl_audio.h index 77162d4..4263767 100644 --- a/src/libjin/audio/SDL/je_sdl_audio.h +++ b/src/libjin/audio/SDL/je_sdl_audio.h @@ -36,6 +36,16 @@ namespace JinEngine int samples; // »º³åÇøµÄsampleÊý£¬<=samplerate }; + /// + /// SDL audio constructor. + /// + SDLAudio() {}; + + /// + /// SDL audio destructor. + /// + ~SDLAudio() {}; + /// /// Play all sources whose state is playing. /// @@ -100,24 +110,12 @@ namespace JinEngine void unlock(); private: - singleton(SDLAudio); - - /// - /// SDL audio constructor. - /// - SDLAudio() {}; - - /// - /// SDL audio destructor. - /// - ~SDLAudio() {}; - /// /// Initialize audio system. /// /// @param setting Audio setting. /// - bool initSystem(const SettingBase* setting) override; + bool startSystem(const SettingBase* setting) override; /// /// Quit audio system. diff --git a/src/libjin/audio/je_audio_manager.h b/src/libjin/audio/je_audio_manager.h index 120d38e..e0c7a4b 100644 --- a/src/libjin/audio/je_audio_manager.h +++ b/src/libjin/audio/je_audio_manager.h @@ -33,6 +33,19 @@ namespace JinEngine PAUSE, }; + /// + /// AudioManager constructor. + /// + AudioManager() + : volume(1) + , state(State::PLAY) + {}; + + /// + /// AudioManager destructor. + /// + virtual ~AudioManager() {}; + /// /// Play all sources whose state is playing. /// @@ -59,21 +72,6 @@ namespace JinEngine virtual void setVolume(float volume) = 0; protected: - singleton(AudioManager); - - /// - /// AudioManager constructor. - /// - AudioManager() - : volume(1) - , state(State::PLAY) - {}; - - /// - /// AudioManager destructor. - /// - virtual ~AudioManager() {}; - float volume; State state; -- cgit v1.1-26-g67d0