[Scummvm-cvs-logs] SF.net SVN: scummvm:[50274] scummvm/trunk/engines/sci/sound/midiparser_sci. cpp

[m_kiewitz at users.sourceforge.net]

Revision: 50274
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50274&view=rev
Author:   m_kiewitz
Date:     2010-06-25 16:43:09 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
SCI: only send new volume to currently mapped channels, fixes assert in sq1 because setVolume is called on an object that's currently not playing. added fixme

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/midiparser_sci.cpp

Modified: scummvm/trunk/engines/sci/sound/midiparser_sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-06-25 16:16:29 UTC (rev 50273)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-06-25 16:43:09 UTC (rev 50274)
@@ -672,9 +672,11 @@
 
 		case SCI_VERSION_1_EARLY:
 		case SCI_VERSION_1_LATE:
-			// sending volume change to all used channels
+			// sending volume change to all currently mapped channels
+			// FIXME?: maybe we should better store new volume if music isn't playing currently and adjust volume
+			//  when playing
 			for (int i = 0; i < 15; i++)
-				if (_channelUsed[i])
+				if (_channelRemap[i] != -1)
 					sendToDriver(0xB0 + i, 7, _volume);
 			break;
 


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