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

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Sat Jun 19 21:47:23 CEST 2010


Revision: 50059
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50059&view=rev
Author:   m_kiewitz
Date:     2010-06-19 19:47:22 +0000 (Sat, 19 Jun 2010)

Log Message:
-----------
SCI: reverting r50058 - we can't actually send to the channels at that time, because we do not own the channels at that point

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-19 19:39:36 UTC (rev 50058)
+++ scummvm/trunk/engines/sci/sound/midiparser_sci.cpp	2010-06-19 19:47:22 UTC (rev 50059)
@@ -81,6 +81,10 @@
 	_channelRemap[9] = 9; // never map channel 9, because that's used for percussion
 	_channelRemap[15] = 15; // never map channel 15, because thats used by sierra internally
 
+	// we can't do this later, because otherwise we really send to unmapped channels
+	if (_pSnd)
+		setVolume(_pSnd->volume);
+
 	if (channelFilterMask) {
 		// SCI0 only has 1 data stream, but we need to filter out channels depending on music hardware selection
 		midiFilterChannels(channelFilterMask);
@@ -88,9 +92,6 @@
 		midiMixChannels();
 	}
 
-	if (_pSnd)
-		setVolume(_pSnd->volume);
-
 	_num_tracks = 1;
 	_tracks[0] = _mixedData;
 	if (_pSnd)


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