[Scummvm-cvs-logs] SF.net SVN: scummvm:[52737] scummvm/trunk/engines/kyra/sound_midi.cpp

lordhoto at users.sourceforge.net lordhoto at users.sourceforge.net
Thu Sep 16 00:00:43 CEST 2010


Revision: 52737
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52737&view=rev
Author:   lordhoto
Date:     2010-09-15 22:00:43 +0000 (Wed, 15 Sep 2010)

Log Message:
-----------
KYRA: Send GM reset on startup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_midi.cpp

Modified: scummvm/trunk/engines/kyra/sound_midi.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_midi.cpp	2010-09-15 22:00:20 UTC (rev 52736)
+++ scummvm/trunk/engines/kyra/sound_midi.cpp	2010-09-15 22:00:43 UTC (rev 52737)
@@ -134,10 +134,14 @@
 	static const byte sysEx2[] = { 3, 4, 3, 4, 3, 4, 3, 4, 4 };
 	static const byte sysEx3[] = { 0, 3, 2 };
 
-	sendSysEx(0x7F, 0x00, 0x00, sysEx1, 1);
-	sendSysEx(0x10, 0x00, 0x0D, sysEx1, 9);
-	sendSysEx(0x10, 0x00, 0x04, sysEx2, 9);
-	sendSysEx(0x10, 0x00, 0x01, sysEx3, 3);
+	if (_isMT32) {
+		sendSysEx(0x7F, 0x00, 0x00, sysEx1, 1);
+		sendSysEx(0x10, 0x00, 0x0D, sysEx1, 9);
+		sendSysEx(0x10, 0x00, 0x04, sysEx2, 9);
+		sendSysEx(0x10, 0x00, 0x01, sysEx3, 3);
+	} else {
+		_output->sendGMReset();
+	}
 
 	memset(_channels, 0, sizeof(_channels));
 	for (int i = 0; i < 16; ++i) {


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