From f8271e0d07db5af850934595cb2c708f7d61bfaf Mon Sep 17 00:00:00 2001 From: dhewg Date: Sat, 19 Mar 2011 14:50:28 +0100 Subject: AGOS: Cleanup syncSoundSettings() --- engines/agos/agos.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp index ae95bb0d2b..574031d047 100644 --- a/engines/agos/agos.cpp +++ b/engines/agos/agos.cpp @@ -1045,18 +1045,15 @@ uint32 AGOSEngine::getTime() const { } void AGOSEngine::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"); + Engine::syncSoundSettings(); bool mute = false; if (ConfMan.hasKey("mute")) mute = ConfMan.getBool("mute"); - _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : (_musicPaused ? 0 : soundVolumeMusic))); - _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX)); - _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech)); + // Sync the engine with the config manager + int soundVolumeMusic = ConfMan.getInt("music_volume"); + int soundVolumeSFX = ConfMan.getInt("sfx_volume"); if (_midiEnabled) _midi.setVolume((mute ? 0 : soundVolumeMusic), (mute ? 0 : soundVolumeSFX)); -- cgit v1.2.3