Ticket #8276: native_m32.diff

scummvm/scumm/scummvm.cpp

@@ -734 +734 @@
         } else if (((_midiDriver == MD_PCJR) || (_midiDriver == MD_PCSPK)) && ((_version > 2) && (_version < 5))) {
                 _musicEngine = _playerV2 = new Player_V2(this);
         } else if (_version > 2) {
+                MidiDriver *driver = detector->createMidi();
+                if (driver)
+                        driver->property (MidiDriver::PROP_CHANNEL_MASK, 0x03FE);
                 _musicEngine = _imuse = IMuse::create(syst, _mixer, detector->createMidi());
                 if (_imuse) {
                         if (detector->_gameTempo != 0)

scummvm/sound/mididrv.h

@@ -44 +44 @@
 
         enum {
 //              PROP_TIMEDIV = 1,
-                PROP_OLD_ADLIB = 2
+                PROP_OLD_ADLIB = 2,
+                PROP_CHANNEL_MASK = 3
         };
 
         // Open the midi driver.

scummvm/sound/mpu401.cpp

@@ -85 +85 @@
         _started_thread (false),
         _mutex (0),
         _timer_proc (0),
-        _timer_param (0)
+        _timer_param (0),
+        _channel_mask (0xFFFF) // Permit all 16 channels by default
 {
         
         uint i;
@@ -106 +107 @@
                 send (0x7B << 8 | 0xB0 | i);
 }
 
+uint32 MidiDriver_MPU401::property (int prop, uint32 param) {
+        switch (prop) {
+                case PROP_CHANNEL_MASK:
+                        _channel_mask = param & 0xFFFF;
+                        return 1;
+        }
+
+        return 0;
+}
+
 MidiChannel *MidiDriver_MPU401::allocateChannel() {
         MidiChannel_MPU401 *chan;
         uint i;
 
         for (i = 0; i < ARRAYSIZE(_midi_channels); ++i) {
-                if (i == 9)
+                if (i == 9 || !(_channel_mask & (1 << i)))
                         continue;
                 chan = &_midi_channels[i];
                 if (!chan->_allocated) {

scummvm/sound/mpu401.h

@@ -85 +85 @@
         OSystem::MutexRef _mutex; // Concurrent shutdown barrier
         volatile TimerCallback _timer_proc;
         void *_timer_param;
+        uint16 _channel_mask;
 
         static int midi_driver_thread (void *param);
 
@@ -94 +95 @@
         virtual void close();
         void setTimerCallback(void *timer_param, TimerCallback timer_proc);
         uint32 getBaseTempo(void) { return 10000; }
+        uint32 property(int prop, uint32 param);
 
         MidiChannel *allocateChannel();
         MidiChannel *getPercussionChannel() { return &_midi_channels [9]; }