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

[thebluegr at users.sourceforge.net]

Revision: 46930
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46930&view=rev
Author:   thebluegr
Date:     2010-01-03 16:11:31 +0000 (Sun, 03 Jan 2010)

Log Message:
-----------
SCI/new music code: Some cleanup. Previous commit (rev 46928) should read: "Added some more commands from BaseSongIterator::parseMidiCommand()"

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=46928&view=rev

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 16:03:27 UTC (rev 46929)
+++ scummvm/trunk/engines/sci/sfx/midiparser.cpp	2010-01-03 16:11:31 UTC (rev 46930)
@@ -166,6 +166,14 @@
 					break;
 				}
 				break;
+			// Unhandled SCI commands
+			case 0x46: // LSL3 - binoculars
+			case 0x61: // Iceman (Adlib?)
+			case 0x73: // Hoyle
+			case 0xd1: // KQ4, when riding the unicorn
+				// Obscure SCI commands - ignored
+				break;
+			// Standard MIDI commands
 			case 0x01:	// mod wheel
 			case 0x04:	// foot controller
 			case 0x07:	// channel volume
@@ -181,12 +189,6 @@
 				// 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;
-			case 0x46: // LSL3 - binoculars
-			case 0x61: // Iceman (Adlib?)
-			case 0x73: // Hoyle
-			case 0xd1: // KQ4, when riding the unicorn
-				// Obscure SCI commands - ignored
-				break;
 			default:
 				warning("Unhandled SCI MIDI command 0x%x (parameter %d)", info.basic.param1, info.basic.param2);
 				break;
@@ -482,3 +484,4 @@
 }
 
 } // End of namespace Sci
+space Sci


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