diff options
| author | Max Horn | 2005-05-10 23:48:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 23:48:48 +0000 |
| commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
| tree | f687ac73ffbfa29088a403b6311bb4db13265fde /scumm/smush/smush_mixer.h | |
| parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
| download | scummvm-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 'scumm/smush/smush_mixer.h')
| -rw-r--r-- | scumm/smush/smush_mixer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h index 5e56103190..0f6417f721 100644 --- a/scumm/smush/smush_mixer.h +++ b/scumm/smush/smush_mixer.h @@ -35,7 +35,7 @@ class SmushMixer { }; private: - SoundMixer *_mixer; + Audio::Mixer *_mixer; struct channels { int id; SmushChannel *chan; @@ -49,7 +49,7 @@ private: public: - SmushMixer(SoundMixer *); + SmushMixer(Audio::Mixer *); virtual ~SmushMixer(); SmushChannel *findChannel(int32 track); void addChannel(SmushChannel *c); |