From e9410bd371fc68169c57d2c52382948a0b083da4 Mon Sep 17 00:00:00 2001 From: chai Date: Sat, 20 Oct 2018 15:50:06 +0800 Subject: =?UTF-8?q?*=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E7=A9=BA=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/libjin/Audio/SDL/je_sdl_audio.cpp | 12 ++++---- src/libjin/Audio/SDL/je_sdl_audio.h | 12 ++++---- src/libjin/Audio/SDL/je_sdl_source.cpp | 10 +++---- src/libjin/Audio/SDL/je_sdl_source.h | 8 ++--- src/libjin/Audio/je_audio.cpp | 15 ---------- src/libjin/Audio/je_audio.h | 53 -------------------------------- src/libjin/Audio/je_audio_manager.cpp | 15 ++++++++++ src/libjin/Audio/je_audio_manager.h | 55 ++++++++++++++++++++++++++++++++++ src/libjin/Audio/je_source.cpp | 8 ++--- src/libjin/Audio/je_source.h | 8 ++--- 10 files changed, 99 insertions(+), 97 deletions(-) delete mode 100644 src/libjin/Audio/je_audio.cpp delete mode 100644 src/libjin/Audio/je_audio.h create mode 100644 src/libjin/Audio/je_audio_manager.cpp create mode 100644 src/libjin/Audio/je_audio_manager.h (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 0cc8380..cd79bed 100644 --- a/src/libjin/Audio/SDL/je_sdl_audio.cpp +++ b/src/libjin/Audio/SDL/je_sdl_audio.cpp @@ -9,12 +9,12 @@ #include "je_sdl_audio.h" #include "je_sdl_source.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { - using namespace jin::math; + using namespace JinEngine::Math; /* 注意callback是在音频线程调用 */ static void defaultCallback(void *userdata, Uint8 *stream, int size) @@ -32,7 +32,7 @@ namespace jin /*call only once*/ bool SDLAudio::initSystem(const SettingBase* s) { #if LIBJIN_DEBUG - Loghelper::log(Loglevel::LV_INFO, "Init Audio System"); + Loghelper::log(Loglevel::LV_INFO, "Init AudioManager System"); #endif if (SDL_Init(SDL_INIT_AUDIO) < 0) @@ -137,7 +137,7 @@ namespace jin this->volume = clamp(volume, 0.0f, 1.0f); } - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO diff --git a/src/libjin/Audio/SDL/je_sdl_audio.h b/src/libjin/Audio/SDL/je_sdl_audio.h index 4ce3756..01da7b3 100644 --- a/src/libjin/Audio/SDL/je_sdl_audio.h +++ b/src/libjin/Audio/SDL/je_sdl_audio.h @@ -5,20 +5,20 @@ #include -#include "../je_audio.h" +#include "../je_audio_manager.h" #include "je_sdl_source.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { #define SDLAUDIO_BITDEPTH 16 #define SDLAUDIO_BYTEDEPTH (SDLAUDIO_BITDEPTH >> 3) #define SDLAUDIO_CHANNELS 2 - class SDLAudio : public Audio + class SDLAudio : public AudioManager { public: struct Setting : SettingBase @@ -55,8 +55,8 @@ namespace jin }; - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #endif // __JE_AUDIO_SDL_H diff --git a/src/libjin/Audio/SDL/je_sdl_source.cpp b/src/libjin/Audio/SDL/je_sdl_source.cpp index 5fbce49..210d058 100644 --- a/src/libjin/Audio/SDL/je_sdl_source.cpp +++ b/src/libjin/Audio/SDL/je_sdl_source.cpp @@ -14,12 +14,12 @@ #include "je_sdl_audio.h" #include "je_sdl_source.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { - using namespace jin::math; + using namespace JinEngine::Math; #define BITS 8 @@ -395,7 +395,7 @@ namespace jin } - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO diff --git a/src/libjin/Audio/SDL/je_sdl_source.h b/src/libjin/Audio/SDL/je_sdl_source.h index 1d055bf..b32ecce 100644 --- a/src/libjin/Audio/SDL/je_sdl_source.h +++ b/src/libjin/Audio/SDL/je_sdl_source.h @@ -10,9 +10,9 @@ #include "../je_source.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { typedef struct SDLSourceCommand; @@ -100,8 +100,8 @@ namespace jin } }; - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO && LIBJIN_AUDIO_SDLAUDIO #endif // __JE_SOURCE_SDL_H diff --git a/src/libjin/Audio/je_audio.cpp b/src/libjin/Audio/je_audio.cpp deleted file mode 100644 index 81201b7..0000000 --- a/src/libjin/Audio/je_audio.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "../core/je_configuration.h" -#if LIBJIN_MODULES_AUDIO - -#include "SDL2/SDL.h" -#include "je_audio.h" - -namespace jin -{ - namespace audio - { - - } // namespace audio -} // namespace jin - -#endif // LIBJIN_MODULES_AUDIO diff --git a/src/libjin/Audio/je_audio.h b/src/libjin/Audio/je_audio.h deleted file mode 100644 index 4dd8007..0000000 --- a/src/libjin/Audio/je_audio.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef __JE_AUDIO_H -#define __JE_AUDIO_H - -#include "../core/je_configuration.h" -#if LIBJIN_MODULES_AUDIO - -#include "../utils/je_macros.h" -#include "../common/je_subsystem.hpp" - -#include "SDL2/SDL.h" - -namespace jin -{ - namespace audio - { - - class Source; - - template - class Audio : public Subsystem - { - public: - enum State - { - PLAY , - STOP , - PAUSE, - }; - - virtual void play() = 0; - virtual void stop() = 0; - virtual void pause() = 0; - virtual void resume() = 0; - virtual void setVolume(float volume) = 0; - - protected: - Audio() - : volume(1) - , state(State::PLAY) - {}; - virtual ~Audio() {}; - singleton(Audio); - - float volume; - State state; - - }; - - } // namespace audio -} // namespace jin - -#endif // LIBJIN_MODULES_AUDIO -#endif // __JE_AUDIO_H diff --git a/src/libjin/Audio/je_audio_manager.cpp b/src/libjin/Audio/je_audio_manager.cpp new file mode 100644 index 0000000..4b56132 --- /dev/null +++ b/src/libjin/Audio/je_audio_manager.cpp @@ -0,0 +1,15 @@ +#include "../core/je_configuration.h" +#if LIBJIN_MODULES_AUDIO + +#include "SDL2/SDL.h" +#include "je_audio_manager.h" + +namespace JinEngine +{ + namespace Audio + { + + } // namespace Audio +} // namespace JinEngine + +#endif // LIBJIN_MODULES_AUDIO diff --git a/src/libjin/Audio/je_audio_manager.h b/src/libjin/Audio/je_audio_manager.h new file mode 100644 index 0000000..86716ef --- /dev/null +++ b/src/libjin/Audio/je_audio_manager.h @@ -0,0 +1,55 @@ +#ifndef __JE_AUDIO_H +#define __JE_AUDIO_H + +#include "../core/je_configuration.h" +#if LIBJIN_MODULES_AUDIO + +#include "../utils/je_macros.h" +#include "../common/je_subsystem.hpp" + +#include "SDL2/SDL.h" + +namespace JinEngine +{ + namespace Audio + { + + class Source; + + template + class AudioManager : public Subsystem + { + public: + enum State + { + PLAY , + STOP , + PAUSE, + }; + + virtual void play() = 0; + virtual void stop() = 0; + virtual void pause() = 0; + virtual void resume() = 0; + virtual void setVolume(float volume) = 0; + + protected: + singleton(AudioManager); + + AudioManager() + : volume(1) + , state(State::PLAY) + {}; + virtual ~AudioManager() {}; + + float volume; + State state; + + }; + + } // namespace Audio +} // namespace JinEngine + +#endif // LIBJIN_MODULES_AUDIO + +#endif // __JE_AUDIO_H diff --git a/src/libjin/Audio/je_source.cpp b/src/libjin/Audio/je_source.cpp index e20cd69..573366d 100644 --- a/src/libjin/Audio/je_source.cpp +++ b/src/libjin/Audio/je_source.cpp @@ -5,9 +5,9 @@ #include "je_source.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { static int check_header(const void *data, int size, const char *str, int offset) { @@ -24,7 +24,7 @@ namespace jin return SourceType::INVALID; } - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO diff --git a/src/libjin/Audio/je_source.h b/src/libjin/Audio/je_source.h index 07cfee5..9ef0b46 100644 --- a/src/libjin/Audio/je_source.h +++ b/src/libjin/Audio/je_source.h @@ -5,9 +5,9 @@ #include "SDL2/SDL.h" -namespace jin +namespace JinEngine { - namespace audio + namespace Audio { enum SourceType @@ -40,8 +40,8 @@ namespace jin }; - } // namespace audio -} // namespace jin + } // namespace Audio +} // namespace JinEngine #endif // LIBJIN_MODULES_AUDIO #endif // __JE_AUDIO_SOURCE_H -- cgit v1.1-26-g67d0