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

[Kirben at users.sourceforge.net]

Revision: 27282
          http://scummvm.svn.sourceforge.net/scummvm/?rev=27282&view=rev
Author:   Kirben
Date:     2007-06-09 22:43:56 -0700 (Sat, 09 Jun 2007)

Log Message:
-----------
Fix toggling music on/off in games, when using non-MIDI music.

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

Modified: scummvm/trunk/engines/agos/input.cpp
===================================================================
--- scummvm/trunk/engines/agos/input.cpp	2007-06-10 05:43:29 UTC (rev 27281)
+++ scummvm/trunk/engines/agos/input.cpp	2007-06-10 05:43:56 UTC (rev 27282)
@@ -25,6 +25,7 @@
 
 #include "common/stdafx.h"
 
+#include "common/config-manager.h"
 #include "common/file.h"
 
 #include "agos/intern.h"
@@ -578,10 +579,11 @@
 		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, _mixer->getVolumeForSoundType(Audio::Mixer::kMusicSoundType) - 16);
 		break;
 	case 'm':
+		_musicPaused ^= 1;
 		if (_midiEnabled) {
-			_midi.pause(_musicPaused ^= 1);
+			_midi.pause(_musicPaused);
 		}
-		// TODO
+		_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, (_musicPaused) ? 0 : ConfMan.getInt("music_volume"));
 		break;
 	case 's':
 		if (getGameId() == GID_SIMON1DOS) {


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