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

[thebluegr at users.sourceforge.net]

Revision: 47324
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47324&view=rev
Author:   thebluegr
Date:     2010-01-16 16:54:54 +0000 (Sat, 16 Jan 2010)

Log Message:
-----------
Disabled code which causes crashes/and or oddities with MIDI in later SCI games, from rev #47321

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=47321&view=rev

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

Modified: scummvm/trunk/engines/sci/sound/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/music.cpp	2010-01-16 16:21:17 UTC (rev 47323)
+++ scummvm/trunk/engines/sci/sound/music.cpp	2010-01-16 16:54:54 UTC (rev 47324)
@@ -319,9 +319,10 @@
 			channelFilterMask = pSnd->soundRes->getChannelFilterMask(_pMidiDrv->getPlayId(_soundVersion));
 
 			// Enable rhythm channel when requested
-			channelFilterMask &= ~(1 << MIDI_RHYTHM_CHANNEL);
+			// FIXME: this causes crashes and/or oddities for newer games (SCI1+)
+			/*channelFilterMask &= ~(1 << MIDI_RHYTHM_CHANNEL);
 			if (_pMidiDrv->hasRhythmChannel())
-				channelFilterMask |= (1 << MIDI_RHYTHM_CHANNEL);
+				channelFilterMask |= (1 << MIDI_RHYTHM_CHANNEL);*/
 
 			pSnd->pMidiParser->loadMusic(track, pSnd, channelFilterMask, _soundVersion);
 


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