aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordhewg2011-03-19 15:08:37 +0100
committerdhewg2011-03-19 16:04:56 +0100
commitfa11a6e8cffc0ed177329aaa0e8bf15387a15d49 (patch)
tree20be7b17994cf6c049f475246be851a79acfcae1
parent2cb664178654e4cbe388bd63ae5bdda62b6640ca (diff)
downloadscummvm-rg350-fa11a6e8cffc0ed177329aaa0e8bf15387a15d49.tar.gz
scummvm-rg350-fa11a6e8cffc0ed177329aaa0e8bf15387a15d49.tar.bz2
scummvm-rg350-fa11a6e8cffc0ed177329aaa0e8bf15387a15d49.zip
SCUMM: Cleanup syncSoundSettings()
-rw-r--r--engines/scumm/scumm.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index c2556d6467..564f3a7e9c 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1874,11 +1874,11 @@ void ScummEngine::setupMusic(int midi) {
}
void ScummEngine::syncSoundSettings() {
+ Engine::syncSoundSettings();
// Sync the engine with the config manager
int soundVolumeMusic = ConfMan.getInt("music_volume");
int soundVolumeSfx = ConfMan.getInt("sfx_volume");
- int soundVolumeSpeech = ConfMan.getInt("speech_volume");
bool mute = false;
@@ -1886,7 +1886,7 @@ void ScummEngine::syncSoundSettings() {
mute = ConfMan.getBool("mute");
if (mute)
- soundVolumeMusic = soundVolumeSfx = soundVolumeSpeech = 0;
+ soundVolumeMusic = soundVolumeSfx = 0;
}
if (_musicEngine) {
@@ -1897,10 +1897,6 @@ void ScummEngine::syncSoundSettings() {
_townsPlayer->setSfxVolume(soundVolumeSfx);
}
- _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, soundVolumeSfx);
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
- _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, soundVolumeSpeech);
-
if (ConfMan.getBool("speech_mute"))
_voiceMode = 2;
else