aboutsummaryrefslogtreecommitdiff
path: root/engines/agos/agos.cpp
diff options
context:
space:
mode:
authordhewg2011-03-19 14:50:28 +0100
committerdhewg2011-03-19 15:33:34 +0100
commitf8271e0d07db5af850934595cb2c708f7d61bfaf (patch)
treeaccca4c8497a80a6f402cafde6337b51d90f85e0 /engines/agos/agos.cpp
parenta3efe915d30da6ce8d81157fcec5b5d7a51a6184 (diff)
downloadscummvm-rg350-f8271e0d07db5af850934595cb2c708f7d61bfaf.tar.gz
scummvm-rg350-f8271e0d07db5af850934595cb2c708f7d61bfaf.tar.bz2
scummvm-rg350-f8271e0d07db5af850934595cb2c708f7d61bfaf.zip
AGOS: Cleanup syncSoundSettings()
Diffstat (limited to 'engines/agos/agos.cpp')
-rw-r--r--engines/agos/agos.cpp11
1 files 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));