[Scummvm-cvs-logs] SF.net SVN: scummvm:[51100] scummvm/trunk/engines/agos/agos.cpp
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Wed Jul 21 22:12:09 CEST 2010
Revision: 51100
http://scummvm.svn.sourceforge.net/scummvm/?rev=51100&view=rev
Author: lordhoto
Date: 2010-07-21 20:12:09 +0000 (Wed, 21 Jul 2010)
Log Message:
-----------
AGOS: Make AGOS respect the mute setting.
Modified Paths:
--------------
scummvm/trunk/engines/agos/agos.cpp
Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp 2010-07-21 19:59:33 UTC (rev 51099)
+++ scummvm/trunk/engines/agos/agos.cpp 2010-07-21 20:12:09 UTC (rev 51100)
@@ -1039,12 +1039,21 @@
}
void AGOSEngine::syncSoundSettings() {
- _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
- _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
- _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, ConfMan.getInt("speech_volume"));
+ // 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;
+ if (ConfMan.hasKey("mute"))
+ mute = ConfMan.getBool("mute");
+
+ _mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (mute ? 0 : soundVolumeMusic));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, (mute ? 0 : soundVolumeSFX));
+ _mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, (mute ? 0 : soundVolumeSpeech));
+
if (_midiEnabled)
- _midi.setVolume(ConfMan.getInt("music_volume"), ConfMan.getInt("sfx_volume"));
+ _midi.setVolume((mute ? 0 : soundVolumeMusic), (mute ? 0 : soundVolumeSFX));
}
} // End of namespace AGOS
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list