diff options
| author | chai <chaifix@163.com> | 2018-10-20 15:50:06 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-20 15:50:06 +0800 |
| commit | e9410bd371fc68169c57d2c52382948a0b083da4 (patch) | |
| tree | d8f7e600b4ffd6a5c4c9a30f68f9ee74b8491c3b /src/libjin/Audio/SDL | |
| parent | 58ad98213763348b49d8313675203b287a5442bb (diff) | |
*修改名称空间
Diffstat (limited to 'src/libjin/Audio/SDL')
| -rw-r--r-- | src/libjin/Audio/SDL/je_sdl_audio.cpp | 12 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/je_sdl_audio.h | 12 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/je_sdl_source.cpp | 10 | ||||
| -rw-r--r-- | src/libjin/Audio/SDL/je_sdl_source.h | 8 |
4 files changed, 21 insertions, 21 deletions
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 <vector> -#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<SDLAudio> + class SDLAudio : public AudioManager<SDLAudio> { 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 |