[Scummvm-cvs-logs] SF.net SVN: scummvm:[54727] scummvm/trunk/engines/scumm/imuse/imuse.cpp

[lordhoto at users.sourceforge.net]

Revision: 54727
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54727&view=rev
Author:   lordhoto
Date:     2010-12-01 23:55:10 +0000 (Wed, 01 Dec 2010)

Log Message:
-----------
SCUMM: Fix GM initialization when "enable_gs" is set.

This is a regression from r25630, which caused the code to send some garbage
data to the GS device, which resulted in some devices to fail with an
"Address Error." (like the Roland SC-55).

This might also fix bug #1927501 "GS option is broken". Even though actually
the device there failed with another error it is likely to be caused by the
same code. At least it is the only iMuse MIDI code change between 0.9.0 and
0.12.0, which might result in such a problem.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse.cpp

Modified: scummvm/trunk/engines/scumm/imuse/imuse.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse.cpp	2010-12-01 23:15:28 UTC (rev 54726)
+++ scummvm/trunk/engines/scumm/imuse/imuse.cpp	2010-12-01 23:55:10 UTC (rev 54727)
@@ -1483,12 +1483,11 @@
 	// General MIDI System On message
 	// Resets all GM devices to default settings
 	memcpy(&buffer[0], "\x7E\x7F\x09\x01", 4);
-	midi->sysEx(buffer, 6);
+	midi->sysEx(buffer, 4);
 	debug(2, "GM SysEx: GM System On");
 	_system->delayMillis(200);
 
 	if (_enable_gs) {
-
 		// All GS devices recognize the GS Reset command,
 		// even with Roland's ID. It is impractical to
 		// support other manufacturers' devices for


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