diff options
author | Max Horn | 2005-03-09 18:12:54 +0000 |
---|---|---|
committer | Max Horn | 2005-03-09 18:12:54 +0000 |
commit | 0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41 (patch) | |
tree | 16bc04d5b5ddc5945cf14bccb7ce53406aba0807 /queen | |
parent | 13b8f678fc0ee6ab14e3264c58e858061fe625fd (diff) | |
download | scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.gz scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.bz2 scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.zip |
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
Diffstat (limited to 'queen')
-rw-r--r-- | queen/queen.cpp | 4 | ||||
-rw-r--r-- | queen/sound.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/queen/queen.cpp b/queen/queen.cpp index cfa5c3b0db..91446723cb 100644 --- a/queen/queen.cpp +++ b/queen/queen.cpp @@ -405,9 +405,9 @@ int QueenEngine::init(GameDetector &detector) { if (!_mixer->isReady()) warning("Sound initialisation failed"); - _mixer->setVolumeForSoundType(SoundMixer::kSFXAudioDataType, ConfMan.getInt("sfx_volume")); + _mixer->setVolumeForSoundType(SoundMixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setVolumeForSoundType(SoundMixer::kMusicAudioDataType, SoundMixer::kMaxMixerVolume); + _mixer->setVolumeForSoundType(SoundMixer::kMusicSoundType, SoundMixer::kMaxMixerVolume); int midiDriver = MidiDriver::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE); MidiDriver *driver = MidiDriver::createMidi(midiDriver); diff --git a/queen/sound.cpp b/queen/sound.cpp index e4bd0cccd3..a93650ea7f 100644 --- a/queen/sound.cpp +++ b/queen/sound.cpp @@ -201,7 +201,7 @@ void SBSound::sfxPlay(const char *name, bool isSpeech) { void MP3Sound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeMP3Stream(f, size)); } #endif @@ -209,7 +209,7 @@ void MP3Sound::sfxPlay(const char *name, bool isSpeech) { void OGGSound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeVorbisStream(f, size)); } #endif @@ -217,7 +217,7 @@ void OGGSound::sfxPlay(const char *name, bool isSpeech) { void FLACSound::sfxPlay(const char *name, bool isSpeech) { uint32 size; File *f = _vm->resource()->giveCompressedSound(name, &size); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size)); + _mixer->playInputStream(SoundMixer::kSFXSoundType, isSpeech ? &_speechHandle : &_sfxHandle, makeFlacStream(f, size)); } #endif |