aboutsummaryrefslogtreecommitdiff
path: root/base/gameDetector.h
diff options
context:
space:
mode:
authorMax Horn2005-05-10 23:48:48 +0000
committerMax Horn2005-05-10 23:48:48 +0000
commit1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch)
treef687ac73ffbfa29088a403b6311bb4db13265fde /base/gameDetector.h
parent72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff)
downloadscummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2
scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'base/gameDetector.h')
-rw-r--r--base/gameDetector.h6
1 files changed, 4 insertions, 2 deletions
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);