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 /queen/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 'queen/sound.h')
| -rw-r--r-- | queen/sound.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/queen/sound.h b/queen/sound.h index 6aaee1d2bf..34e860a567 100644 --- a/queen/sound.h +++ b/queen/sound.h @@ -51,10 +51,10 @@ class QueenEngine; class Sound { public: - Sound(SoundMixer *mixer, QueenEngine *vm); + Sound(Audio::Mixer *mixer, QueenEngine *vm); virtual ~Sound(); virtual void sfxPlay(const char *name, bool isSpeech) = 0; - static Sound *giveSound(SoundMixer *mixer, QueenEngine *vm, uint8 compression); + static Sound *giveSound(Audio::Mixer *mixer, QueenEngine *vm, uint8 compression); void playSfx(uint16 sfx, bool isSpeech); void playSfx(const char *base, bool isSpeech); void playSong(int16 songNum); @@ -103,7 +103,7 @@ public: protected: void waitFinished(bool isSpeech); - SoundMixer *_mixer; + Audio::Mixer *_mixer; QueenEngine *_vm; bool _sfxToggle; @@ -118,13 +118,13 @@ protected: class SilentSound : public Sound { public: - SilentSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; + SilentSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; void sfxPlay(const char *name, bool isSpeech) { } }; class SBSound : public Sound { public: - SBSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; + SBSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; void sfxPlay(const char *name, bool isSpeech); protected: void playSound(byte *sound, uint32 size, bool isSpeech); @@ -133,7 +133,7 @@ protected: #ifdef USE_MAD class MP3Sound : public Sound { public: - MP3Sound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; + MP3Sound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; void sfxPlay(const char *name, bool isSpeech); }; #endif @@ -141,7 +141,7 @@ public: #ifdef USE_VORBIS class OGGSound : public Sound { public: - OGGSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; + OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; void sfxPlay(const char *name, bool isSpeech); }; #endif @@ -149,7 +149,7 @@ public: #ifdef USE_FLAC class FLACSound : public Sound { public: - FLACSound(SoundMixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; + FLACSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {}; void sfxPlay(const char *name, bool isSpeech); }; #endif // #ifdef USE_FLAC |