[Scummvm-cvs-logs] CVS: scummvm/backends/midi quicktime.cpp,1.4,1.5

Max Horn fingolfin at users.sourceforge.net
Wed May 21 09:08:14 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/midi
In directory sc8-pr-cvs1:/tmp/cvs-serv3809

Modified Files:
	quicktime.cpp 
Log Message:
silence 'Unknown MIDI effect' warning in Simon2

Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- quicktime.cpp	6 Mar 2003 21:45:06 -0000	1.4
+++ quicktime.cpp	21 May 2003 16:07:39 -0000	1.5
@@ -149,8 +149,7 @@
 	case 0xB0:										// Effect
 		switch (midiCmd[1]) {
 		case 0x01:									// Modulation
-			NASetController(qtNoteAllocator, qtNoteChannel[chanID],
-											kControllerModulationWheel, midiCmd[2] << 8);
+			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerModulationWheel, midiCmd[2] << 8);
 			break;
 
 		case 0x07:									// Volume
@@ -158,8 +157,7 @@
 			break;
 
 		case 0x0A:									// Pan
-			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan,
-											(midiCmd[2] << 1) + 0xFF);
+			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan, (midiCmd[2] << 1) + 0xFF);
 			break;
 
 		case 0x40:									// Sustain on/off
@@ -188,12 +186,12 @@
 			break;
 
 		case 0x12:	// Occurs in Scumm games
+		case 0x77:	// Occurs in Simon2
 		case 0x79:	// Occurs in Simon1
 			// What are these ?!? Ignore it for now
 			break;
 
 		default:
-			// Error: Unknown MIDI effect: 007f76b3
 			warning("Unknown MIDI effect: %08x", (int)b);
 			break;
 		}





More information about the Scummvm-git-logs mailing list