[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.71,1.72

Jamieson Christian jamieson630 at users.sourceforge.net
Mon Nov 4 10:30:10 CET 2002


Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv9688/scummvm/scumm

Modified Files:
	imuse.cpp 
Log Message:
Increased GM channel resource to full spectrum (0-15, instead of 0-8 Base MIDI config); misc. pitchbend cleanups

Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- imuse.cpp	27 Oct 2002 19:32:35 -0000	1.71
+++ imuse.cpp	4 Nov 2002 18:29:25 -0000	1.72
@@ -608,7 +608,7 @@
 	IMuseInternal *_se;
 	OSystem *_system;
 	MidiDriver *_md;
-	MidiChannelGM _midi_channels[9];
+	MidiChannelGM _midi_channels[16];
 
 	int16 _midi_pitchbend_last[16];
 	byte _midi_pitchbend_factor_last[16];
@@ -4550,11 +4550,7 @@
 void IMuseGM::midiPitchBendFactor (byte chan, byte factor) {
 	if (_midi_pitchbend_factor_last[chan] != factor) {
 		_midi_pitchbend_factor_last[chan] = factor;
-		_md->setPitchBendRange (chan, factor); // For high-level semantic drivers (such as QTMA)
-		_md->send((   0   << 16) | (101 << 8) | (0xB0 | chan));
-		_md->send((   0   << 16) | (100 << 8) | (0xB0 | chan));
-		_md->send((factor << 16) | (  6 << 8) | (0xB0 | chan));
-		_md->send((   0   << 16) | ( 38 << 8) | (0xB0 | chan));
+		_md->setPitchBendRange (chan, factor);
 	}
 }
 
@@ -4776,13 +4772,15 @@
 		lopri = 255;
 		lomc = NULL;
 		for (i = ARRAYSIZE(_midi_channels), mc = _midi_channels;; mc++) {
-			if (!mc->_part) {
-				lomc = mc;
-				break;
-			}
-			if (mc->_part->_pri_eff <= lopri) {
-				lopri = mc->_part->_pri_eff;
-				lomc = mc;
+			if (mc->_chan != 9) {
+				if (!mc->_part) {
+					lomc = mc;
+					break;
+				}
+				if (mc->_part->_pri_eff <= lopri) {
+					lopri = mc->_part->_pri_eff;
+					lomc = mc;
+				}
 			}
 
 			if (!--i) {





More information about the Scummvm-git-logs mailing list