Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)

svn-id: r18039

3 files changed, 10 insertions, 6 deletions

diff --git a/base/engine.h b/base/engine.h
index 1aa2a07084..6c34b988de 100644
--- a/base/engine.h
+++ b/base/engine.h
@@ -26,7 +26,9 @@
 
 class GameDetector;
 class OSystem;
-class SoundMixer;
+namespace Audio {
+	class Mixer;
+}
 namespace Common {
 	class SaveFileManager;
 	class Timer;
@@ -35,7 +37,7 @@ namespace Common {
 class Engine {
 public:
 	OSystem *_system;
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 	Common::Timer * _timer;
 
 protected:
diff --git a/base/gameDetector.cpp b/base/gameDetector.cpp
index aa08306e75..ab3b2559fb 100644
--- a/base/gameDetector.cpp
+++ b/base/gameDetector.cpp
@@ -633,6 +633,6 @@ Engine *GameDetector::createEngine(OSystem *sys) {
 	return _plugin->createInstance(this, sys);
 }
 
-SoundMixer *GameDetector::createMixer() {
-	return new SoundMixer();
+Audio::Mixer *GameDetector::createMixer() {
+	return new Audio::Mixer();
 }
diff --git a/base/gameDetector.h b/base/gameDetector.h
index dc9dc1ed6f..90eb57675e 100644
--- a/base/gameDetector.h
+++ b/base/gameDetector.h
@@ -29,7 +29,9 @@ class Engine;
 class GameDetector;
 class OSystem;
 class Plugin;
-class SoundMixer;
+namespace Audio {
+	class Mixer;
+}
 
 /** Global (shared) game feature flags. */
 enum {
@@ -66,7 +68,7 @@ public:
 public:
 	Engine *createEngine(OSystem *system);
 
-	static SoundMixer *createMixer();
+	static Audio::Mixer *createMixer();
 
 	static GameSettings findGame(const String &gameName, const Plugin **plugin = NULL);