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

[eriktorbjorn at users.sourceforge.net]

Revision: 22479
Author:   eriktorbjorn
Date:     2006-05-15 06:19:30 -0700 (Mon, 15 May 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22479&view=rev

Log Message:
-----------
Ignore unknown SysEx manufacturer IDs, rather than erroring on them. This does
NOT fix bug #1481383, even if that's where I heard about this problem.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
Modified: scummvm/trunk/engines/scumm/imuse/imuse_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse/imuse_player.cpp	2006-05-15 12:39:53 UTC (rev 22478)
+++ scummvm/trunk/engines/scumm/imuse/imuse_player.cpp	2006-05-15 13:19:30 UTC (rev 22479)
@@ -369,7 +369,13 @@
 			// FM-TOWNS custom instrument definition
 			_midi->sysEx_customInstrument(p[0], 'EUP ', p + 1);
 		} else {
-			error("Unknown SysEx manufacturer 0x%02X", (int)a);
+			// SysEx manufacturer 0x97 has been spotted in the
+			// Monkey Island 2 Adlib music, so don't make this a
+			// fatal error. See bug #1481383.
+			if (a == 0)
+				warning("Unknown SysEx manufacturer 0x00 0x%02X 0x%02X", p[0], p[1]);
+			else
+				warning("Unknown SysEx manufacturer 0x%02X", (int)a);
 		}
 		return;
 	}


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