[Scummvm-cvs-logs] CVS: scummvm/sound mididrv.h,1.5,1.6 mididrv.cpp,1.20,1.21

[Jamieson Christian]

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

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

Index: mididrv.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mididrv.h	21 Oct 2002 12:46:16 -0000	1.5
+++ mididrv.h	4 Nov 2002 18:29:26 -0000	1.6
@@ -99,7 +99,13 @@
 	static const char *get_error_name(int error_code);
 
 	// HIGH-LEVEL SEMANTIC METHODS
-	virtual void setPitchBendRange (byte channel, uint range) = 0;
+	virtual void setPitchBendRange (byte channel, uint range)
+	{
+		send((  0   << 16) | (101 << 8) | (0xB0 | channel));
+		send((  0   << 16) | (100 << 8) | (0xB0 | channel));
+		send((range << 16) | (  6 << 8) | (0xB0 | channel));
+		send((  0   << 16) | ( 38 << 8) | (0xB0 | channel));
+	}
 };
 
 

Index: mididrv.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/mididrv.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- mididrv.cpp	30 Oct 2002 23:18:52 -0000	1.20
+++ mididrv.cpp	4 Nov 2002 18:29:26 -0000	1.21
@@ -961,21 +961,6 @@
 	// start the output
 	AudioOutputUnitStart(au_output);
 
-#if 1
-	// Send initial pitch bend sensitivity values for +/- 12 semitones.
-	// For information on control change registered parameters,
-	// which includes the Pitch Bend sensitivity settings,
-	// visit http://www.midi.org/about-midi/table3.htm,
-	// Table 3a.
-	int chan;
-	for (chan = 0; chan < 16; ++chan) {
-		MusicDeviceMIDIEvent(au_MusicDevice, (0xB0 | chan), 101,  0, 0);
-		MusicDeviceMIDIEvent(au_MusicDevice, (0xB0 | chan), 100,  0, 0);
-		MusicDeviceMIDIEvent(au_MusicDevice, (0xB0 | chan),   6, 12, 0);
-		MusicDeviceMIDIEvent(au_MusicDevice, (0xB0 | chan),  38,  0, 0);
-	} // next for
-#endif
-
 	return 0;
 }