From e723f7d1ebb1a0476ee2de9c04d1c8ba3fe32c8a Mon Sep 17 00:00:00 2001
From: Torbjörn Andersson
Date: Mon, 15 May 2006 13:19:30 +0000
Subject: 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.

svn-id: r22479
---
 engines/scumm/imuse/imuse_player.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp
index fef5dc37ed..a0c838beb7 100644
--- a/engines/scumm/imuse/imuse_player.cpp
+++ b/engines/scumm/imuse/imuse_player.cpp
@@ -369,7 +369,13 @@ void Player::sysEx(const byte *p, uint16 len) {
 			// 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;
 	}
-- 
cgit v1.2.3