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/sound.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/sound.h')
-rw-r--r-- | sword1/sound.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sword1/sound.h b/sword1/sound.h index 8a65f0dcf0..5b2469aa81 100644 --- a/sword1/sound.h +++ b/sword1/sound.h @@ -28,7 +28,9 @@ #include "sound/mixer.h" #include "common/util.h" -class SoundMixer; +namespace Audio { + class Mixer; +} namespace Sword1 { @@ -67,7 +69,7 @@ enum CowMode { class Sound { public: - Sound(const char *searchPath, SoundMixer *mixer, ResMan *pResMan); + Sound(const char *searchPath, Audio::Mixer *mixer, ResMan *pResMan); ~Sound(void); void setSpeechVol(uint8 volL, uint8 volR) { _speechVolL = volL; _speechVolR = volR; }; void setSfxVol(uint8 volL, uint8 volR) { _sfxVolL = volL; _sfxVolR = volR; }; @@ -106,7 +108,7 @@ private: QueueElement _fxQueue[MAX_FXQ_LENGTH]; uint8 _endOfQueue; - SoundMixer *_mixer; + Audio::Mixer *_mixer; ResMan *_resMan; char _filePath[100]; static const char _musicList[270]; |