8 files changed, 44 insertions, 42 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
diff --git a/src/libjin/Audio/je_audio.cpp b/src/libjin/Audio/je_audio_manager.cpp
index 81201b7..4b56132 100644
--- a/src/libjin/Audio/je_audio.cpp
+++ b/src/libjin/Audio/je_audio_manager.cpp
@@ -2,14 +2,14 @@
 #if LIBJIN_MODULES_AUDIO
 
 #include "SDL2/SDL.h"
-#include "je_audio.h"
+#include "je_audio_manager.h"
 
-namespace jin
+namespace JinEngine
 {
-	namespace audio
+	namespace Audio
 	{
 
-	} // namespace audio
-} // namespace jin
+	} // namespace Audio
+} // namespace JinEngine
 
 #endif // LIBJIN_MODULES_AUDIO
diff --git a/src/libjin/Audio/je_audio.h b/src/libjin/Audio/je_audio_manager.h
index 4dd8007..86716ef 100644
--- a/src/libjin/Audio/je_audio.h
+++ b/src/libjin/Audio/je_audio_manager.h
@@ -9,15 +9,15 @@
 
 #include "SDL2/SDL.h"
 
-namespace jin
+namespace JinEngine
 {
-	namespace audio
+	namespace Audio
 	{
 
 		class Source;
     
 		template<class SubAudio>
-		class Audio : public Subsystem<SubAudio>
+		class AudioManager : public Subsystem<SubAudio>
 		{
 		public:
 			enum State
@@ -34,20 +34,22 @@ namespace jin
 			virtual void setVolume(float volume) = 0;
 
 		protected:
-			Audio() 
+            singleton(AudioManager);
+
+			AudioManager() 
 				: volume(1) 
 				, state(State::PLAY)
 			{};
-			virtual ~Audio() {};
-			singleton(Audio);
+			virtual ~AudioManager() {};
 
 			float volume;
 			State state;
 
 		};
 
-	} // namespace audio 
-} // namespace jin
+	} // 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