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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sun Jun 10 08:08:59 CEST 2007


Revision: 27284
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27284&view=rev
Author:   Kirben
Date:     2007-06-09 23:08:59 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Fix muting music on startup in games, when using non-MIDI music.

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

Modified: scummvm/trunk/engines/agos/agos.cpp
===================================================================
--- scummvm/trunk/engines/agos/agos.cpp	2007-06-10 06:07:24 UTC (rev 27283)
+++ scummvm/trunk/engines/agos/agos.cpp	2007-06-10 06:08:59 UTC (rev 27284)
@@ -596,8 +596,6 @@
 
 		_midi.setVolume(ConfMan.getInt("music_volume"));
 
-		if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1)
-			_midi.pause(_musicPaused ^= 1);
 
 		_midiEnabled = true;
 	}
@@ -633,6 +631,14 @@
 
 	_moviePlay = new MoviePlayer(this, _mixer);
 
+	if (ConfMan.hasKey("music_mute") && ConfMan.getBool("music_mute") == 1) {
+		_musicPaused = true;
+		if (_midiEnabled) {
+			_midi.pause(_musicPaused);
+		}
+		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, 0);
+	}
+
 	if (ConfMan.hasKey("sfx_mute") && ConfMan.getBool("sfx_mute") == 1) {
 		if (getGameId() == GID_SIMON1DOS)
 			_midi._enable_sfx ^= 1;


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