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 /sword1/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 'sword1/music.h')
-rw-r--r-- | sword1/music.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sword1/music.h b/sword1/music.h index 53873c87cc..5628cbce40 100644 --- a/sword1/music.h +++ b/sword1/music.h @@ -28,7 +28,9 @@ #include "sound/audiostream.h" #include "sound/rate.h" -class SoundMixer; +namespace Audio { + class Mixer; +} namespace Sword1 { @@ -84,7 +86,7 @@ public: class Music : public AudioStream { public: - Music(SoundMixer *pMixer); + Music(Audio::Mixer *pMixer); ~Music(); void startMusic(int32 tuneId, int32 loopFlag); void fadeDown(); @@ -104,7 +106,7 @@ private: st_volume_t _volumeL, _volumeR; MusicHandle _handles[2]; RateConverter *_converter[2]; - SoundMixer *_mixer; + Audio::Mixer *_mixer; uint32 _sampleRate; Common::Mutex _mutex; |