[Scummvm-cvs-logs] scummvm master -> 9af4453ee5fd078e58e061854f363c56d3913943

bluegr md5 at scummvm.org
Thu Mar 3 10:20:00 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
9af4453ee5 SCI: Don't ignore SysEx messages at the driver level but warn instead


Commit: 9af4453ee5fd078e58e061854f363c56d3913943
    https://github.com/scummvm/scummvm/commit/9af4453ee5fd078e58e061854f363c56d3913943
Author: md5 (md5 at scummvm.org)
Date: 2011-03-03T01:18:59-08:00

Commit Message:
SCI: Don't ignore SysEx messages at the driver level but warn instead

SysEx messages in the driver are usually the result of a bug which should
be investigated and not silently ignored

Changed paths:
    engines/sci/sound/drivers/adlib.cpp
    engines/sci/sound/drivers/amigamac.cpp
    engines/sci/sound/drivers/midi.cpp



diff --git a/engines/sci/sound/drivers/adlib.cpp b/engines/sci/sound/drivers/adlib.cpp
index 07a210c..65a8e2e 100644
--- a/engines/sci/sound/drivers/adlib.cpp
+++ b/engines/sci/sound/drivers/adlib.cpp
@@ -321,8 +321,6 @@ void MidiDriver_AdLib::send(uint32 b) {
 		_channels[channel].pitchWheel = (op1 & 0x7f) | ((op2 & 0x7f) << 7);
 		renewNotes(channel, true);
 		break;
-	case 0xf0:	// SysEx, ignore it
-		break;
 	default:
 		warning("ADLIB: Unknown event %02x", command);
 	}
diff --git a/engines/sci/sound/drivers/amigamac.cpp b/engines/sci/sound/drivers/amigamac.cpp
index a095a05..d64dfac 100644
--- a/engines/sci/sound/drivers/amigamac.cpp
+++ b/engines/sci/sound/drivers/amigamac.cpp
@@ -700,8 +700,6 @@ void MidiDriver_AmigaMac::send(uint32 b) {
 	case 0xe0:
 		pitchWheel(channel, (op2 << 7) | op1);
 		break;
-	case 0xf0:	// SysEx, ignore it
-		break;
 	default:
 		warning("Amiga/Mac driver: unknown event %02x", command);
 	}
diff --git a/engines/sci/sound/drivers/midi.cpp b/engines/sci/sound/drivers/midi.cpp
index a9b3162..d166559 100644
--- a/engines/sci/sound/drivers/midi.cpp
+++ b/engines/sci/sound/drivers/midi.cpp
@@ -356,8 +356,6 @@ void MidiPlayer_Midi::send(uint32 b) {
 	case 0xe0:
 		_driver->send(b);
 		break;
-	case 0xf0:	// SysEx, ignore it
-		break;
 	default:
 		warning("Ignoring MIDI event %02x", command);
 	}






More information about the Scummvm-git-logs mailing list