diff options
| -rw-r--r-- | engines/queen/midiadlib.cpp | 2 | ||||
| -rw-r--r-- | engines/queen/queen.cpp | 6 | ||||
| -rw-r--r-- | engines/queen/sound.cpp | 6 |
3 files changed, 6 insertions, 8 deletions
diff --git a/engines/queen/midiadlib.cpp b/engines/queen/midiadlib.cpp index 155bb66716..200c7282f9 100644 --- a/engines/queen/midiadlib.cpp +++ b/engines/queen/midiadlib.cpp @@ -132,7 +132,7 @@ int AdlibMidiDriver::open() { adlibSetNoteVolume(i, 0); adlibTurnNoteOff(i); } - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); + _mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true); return 0; } diff --git a/engines/queen/queen.cpp b/engines/queen/queen.cpp index a164bcfcae..65c6e9e161 100644 --- a/engines/queen/queen.cpp +++ b/engines/queen/queen.cpp @@ -181,7 +181,7 @@ void QueenEngine::checkOptionSettings() { } void QueenEngine::syncSoundSettings() { - _sound->setVolume(ConfMan.getInt("music_volume")); + readOptionSettings(); } void QueenEngine::readOptionSettings() { @@ -432,10 +432,6 @@ int QueenEngine::init() { _logic = new LogicGame(this); } - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume")); - // Set mixer music volume to maximum, since music volume is regulated by MusicPlayer's MIDI messages - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, Audio::Mixer::kMaxMixerVolume); - _sound = Sound::makeSoundInstance(_mixer, this, _resource->getCompression()); _walk = new Walk(this); //_talkspeedScale = (MAX_TEXT_SPEED - MIN_TEXT_SPEED) / 255.0; diff --git a/engines/queen/sound.cpp b/engines/queen/sound.cpp index 0801d72ca4..d17a73c90b 100644 --- a/engines/queen/sound.cpp +++ b/engines/queen/sound.cpp @@ -224,7 +224,6 @@ void PCSound::playSpeech(const char *base) { void PCSound::setVolume(int vol) { Sound::setVolume(vol); - _mixer->setVolumeForSoundType(Audio::Mixer::kPlainSoundType, vol); _music->setVolume(vol); } @@ -275,7 +274,10 @@ void SBSound::playSoundData(Common::File *f, uint32 size, Audio::SoundHandle *so if (sound) { f->read(sound, size); byte flags = Audio::Mixer::FLAG_UNSIGNED | Audio::Mixer::FLAG_AUTOFREE; - _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags); + if (soundHandle == &_speechHandle) + _mixer->playRaw(Audio::Mixer::kSpeechSoundType, soundHandle, sound, size, 11025, flags); + else + _mixer->playRaw(Audio::Mixer::kSFXSoundType, soundHandle, sound, size, 11025, flags); } } |