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

[Max Horn]

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

Modified Files:
	quicktime.cpp 
Log Message:
fixed volume controller (compared to the core midi backend, volumes are now equal; plus this is the logical implementation :-)

Index: quicktime.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/midi/quicktime.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- quicktime.cpp	11 Jun 2003 05:54:46 -0000	1.6
+++ quicktime.cpp	24 Jun 2003 11:56:43 -0000	1.7
@@ -155,11 +155,11 @@
 			break;
 
 		case 0x07:									// Volume
-			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerVolume, midiCmd[2] * 300);
+			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerVolume, midiCmd[2] << 8);
 			break;
 
 		case 0x0A:									// Pan
-			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan, (midiCmd[2] << 1) + 0xFF);
+			NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPan, (midiCmd[2] << 1) + 256);
 			break;
 
 		case 0x40:									// Sustain on/off
@@ -200,7 +200,8 @@
 		break;
 
 	case 0xC0:										// Program change
-		NASetInstrumentNumber(qtNoteAllocator, qtNoteChannel[chanID], midiCmd[1] + 1);
+		// FIXME: For chanID 9 (drum channel), shouldn't we use kFirstDrumkit instead of kFirstGMInstrument ?
+		NASetInstrumentNumber(qtNoteAllocator, qtNoteChannel[chanID], midiCmd[1] + kFirstGMInstrument);
 		break;
 
 	case 0xE0:{									// Pitch bend