[Scummvm-cvs-logs] SF.net SVN: scummvm:[51379] scummvm/trunk/engines/gob/gob.cpp

[drmccoy at users.sourceforge.net]

Revision: 51379
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51379&view=rev
Author:   drmccoy
Date:     2010-07-27 17:14:33 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
GOB: Respect mute option on startup (bug #3032781)

Modified Paths:
--------------
    scummvm/trunk/engines/gob/gob.cpp

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2010-07-27 16:35:28 UTC (rev 51378)
+++ scummvm/trunk/engines/gob/gob.cpp	2010-07-27 17:14:33 UTC (rev 51379)
@@ -126,9 +126,14 @@
 	_pauseStart = 0;
 
 	// Setup mixer
-	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType, ConfMan.getInt("sfx_volume"));
-	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, ConfMan.getInt("music_volume"));
+	bool muteSFX   = ConfMan.getBool("mute") || ConfMan.getBool("sfx_mute");
+	bool muteMusic = ConfMan.getBool("mute") || ConfMan.getBool("music_mute");
 
+	_mixer->setVolumeForSoundType(Audio::Mixer::kSFXSoundType,
+			muteSFX   ? 0 : ConfMan.getInt("sfx_volume"));
+	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType,
+			muteMusic ? 0 : ConfMan.getInt("music_volume"));
+
 	_copyProtection = ConfMan.getBool("copy_protection");
 
 	DebugMan.addDebugChannel(kDebugFuncOp, "FuncOpcodes", "Script FuncOpcodes debug level");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.