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 /saga/music.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 'saga/music.h')
| -rw-r--r-- | saga/music.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/saga/music.h b/saga/music.h index 993df56a27..9fcd66558d 100644 --- a/saga/music.h +++ b/saga/music.h @@ -106,7 +106,7 @@ protected: class Music { public: - Music(SoundMixer *mixer, MidiDriver *driver, int enabled); + Music(Audio::Mixer *mixer, MidiDriver *driver, int enabled); ~Music(void); void setNativeMT32(bool b) { _player->setNativeMT32(b); } bool hasNativeMT32() { return _player->hasNativeMT32(); } @@ -122,7 +122,7 @@ public: private: - SoundMixer *_mixer; + Audio::Mixer *_mixer; MusicPlayer *_player; SoundHandle _musicHandle; |