[Scummvm-cvs-logs] SF.net SVN: scummvm:[46924] scummvm/trunk/engines/sci/sfx/midiparser.cpp

[thebluegr at users.sourceforge.net]

Revision: 46924
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46924&view=rev
Author:   thebluegr
Date:     2010-01-03 14:39:38 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
SCI/new music code: don't throw warnings for MIDI commands which are handled by the music driver

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/midiparser.cpp

Modified: scummvm/trunk/engines/sci/sfx/midiparser.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/midiparser.cpp	2010-01-03 13:28:59 UTC (rev 46923)
+++ scummvm/trunk/engines/sci/sfx/midiparser.cpp	2010-01-03 14:39:38 UTC (rev 46924)
@@ -31,7 +31,7 @@
 
 static const int nMidiParams[] = { 2, 2, 2, 2, 1, 1, 2, 0 };
 
-enum SciSysExCommands {
+enum SciMidiCommands {
 	kSetSignalLoop = 0x7F,
 	kEndOfTrack = 0xFC,
 	kSetReverb = 0x50,
@@ -166,10 +166,20 @@
 					break;
 				}
 				break;
-			case 0x1:	// unknown (example case: LB2CD)
-			case 0xA:	// unknown (example case: LB2CD)
+			case 0x01:	// mod wheel
+			case 0x07:	// channel volume
+			case 0x0A:	// pan
+			case 0x40:	// hold pedal
+			case 0x4E:	// velocity control
+			case 0x7B:	// notes off
+				// These are all handled by the music driver, so ignore them
+				break;
+			case 0x4B:	// voice mapping
+				// TODO: is any support for this needed at the MIDI parser level?
+				warning("Unhanded SCI MIDI command 0x%x - voice mapping (parameter %d)", info.basic.param1, info.basic.param2);
+				break;
 			default:
-				warning("Unhandled SCI SysEx 0x%x (parameter %d)", info.basic.param1, info.basic.param2);
+				warning("Unhandled SCI MIDI command 0x%x (parameter %d)", info.basic.param1, info.basic.param2);
 				break;
 			}
 		}


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