[Scummvm-cvs-logs] CVS: scummvm/base engine.h,1.20,1.21 gameDetector.cpp,1.115,1.116 gameDetector.h,1.33,1.34

[Max Horn]

Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29875/base

Modified Files:
	engine.h gameDetector.cpp gameDetector.h 
Log Message:
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)

Index: engine.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/engine.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- engine.h	10 May 2005 23:17:14 -0000	1.20
+++ engine.h	10 May 2005 23:48:35 -0000	1.21
@@ -26,7 +26,9 @@
 
 class GameDetector;
 class OSystem;
-class SoundMixer;
+namespace Audio {
+	class Mixer;
+}
 namespace Common {
 	class SaveFileManager;
 	class Timer;
@@ -35,7 +37,7 @@
 class Engine {
 public:
 	OSystem *_system;
-	SoundMixer *_mixer;
+	Audio::Mixer *_mixer;
 	Common::Timer * _timer;
 
 protected:

Index: gameDetector.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.cpp,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- gameDetector.cpp	9 May 2005 21:21:17 -0000	1.115
+++ gameDetector.cpp	10 May 2005 23:48:35 -0000	1.116
@@ -633,6 +633,6 @@
 	return _plugin->createInstance(this, sys);
 }
 
-SoundMixer *GameDetector::createMixer() {
-	return new SoundMixer();
+Audio::Mixer *GameDetector::createMixer() {
+	return new Audio::Mixer();
 }

Index: gameDetector.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/gameDetector.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gameDetector.h	10 Mar 2005 16:29:07 -0000	1.33
+++ gameDetector.h	10 May 2005 23:48:36 -0000	1.34
@@ -29,7 +29,9 @@
 class GameDetector;
 class OSystem;
 class Plugin;
-class SoundMixer;
+namespace Audio {
+	class Mixer;
+}
 
 /** Global (shared) game feature flags. */
 enum {
@@ -66,7 +68,7 @@
 public:
 	Engine *createEngine(OSystem *system);
 
-	static SoundMixer *createMixer();
+	static Audio::Mixer *createMixer();
 
 	static GameSettings findGame(const String &gameName, const Plugin **plugin = NULL);