[Scummvm-cvs-logs] CVS: scummvm/simon midi.cpp,1.54,1.55

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv8821/simon

Modified Files:
	midi.cpp 
Log Message:
Added generic send() option to MidiChannel.
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).

Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.

Index: midi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/midi.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- midi.cpp	8 Aug 2003 09:48:42 -0000	1.54
+++ midi.cpp	8 Aug 2003 11:54:24 -0000	1.55
@@ -124,7 +124,7 @@
 	if (!_current->channel [channel])
 		_current->channel[channel] = (channel == 9) ? _driver->getPercussionChannel() : _driver->allocateChannel();
 	if (_current->channel [channel])
-		_driver->send ((b & 0xFFFFFFF0) | _current->channel[channel]->getNumber());
+		_current->channel[channel]->send (b);
 }
 
 void MidiPlayer::metaEvent (byte type, byte *data, uint16 length) {