[Scummvm-cvs-logs] scummvm master -> 3b75ff9132a01b08ddc6f4828f8a27705bebb790

[bluegr]

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:
3b75ff9132 SCI: Added a warning for SCI0 games like in bug #3297881


Commit: 3b75ff9132a01b08ddc6f4828f8a27705bebb790
    https://github.com/scummvm/scummvm/commit/3b75ff9132a01b08ddc6f4828f8a27705bebb790
Author: md5 (md5 at scummvm.org)
Date: 2011-05-11T18:34:20-07:00

Commit Message:
SCI: Added a warning for SCI0 games like in bug #3297881

LB1 Amiga doesn't contain MT-32 music tracks. Added a warning for this
situation

Changed paths:
    engines/sci/sound/midiparser_sci.cpp



diff --git a/engines/sci/sound/midiparser_sci.cpp b/engines/sci/sound/midiparser_sci.cpp
index 18652f0..95b1654 100644
--- a/engines/sci/sound/midiparser_sci.cpp
+++ b/engines/sci/sound/midiparser_sci.cpp
@@ -221,6 +221,7 @@ byte *MidiParser_SCI::midiFilterChannels(int channelMask) {
 	byte command = 0, lastCommand = 0;
 	int delta = 0;
 	int midiParamCount = 0;
+	bool containsMidiData = false;
 
 	_mixedData = outData;
 
@@ -247,6 +248,9 @@ byte *MidiParser_SCI::midiFilterChannels(int channelMask) {
 			}
 		}
 		if ((1 << curChannel) & channelMask) {
+			if (curChannel != 0xF)
+				containsMidiData = true;
+
 			if (command != kEndOfTrack) {
 				// Write delta
 				while (delta > 240) {
@@ -304,6 +308,11 @@ byte *MidiParser_SCI::midiFilterChannels(int channelMask) {
 	*outData++ = 0x00;
 	*outData++ = 0x00;
 
+	// This occurs in the music tracks of LB1 Amiga, when using the MT-32
+	// driver (bug #3297881)
+	if (!containsMidiData)
+		warning("MIDI parser: the requested SCI0 sound has no MIDI note data for the currently selected sound driver");
+
 	return _mixedData;
 }