From fa11a6e8cffc0ed177329aaa0e8bf15387a15d49 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Sat, 19 Mar 2011 15:08:37 +0100
Subject: SCUMM: Cleanup syncSoundSettings()

---
 engines/scumm/scumm.cpp | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'engines/scumm')

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
-- 
cgit v1.2.3