Ticket #8277: mt32pitchbend.diff

scummvm/scumm/imuse.cpp

@@ -43 +43 @@
 
 IMuseInternal::IMuseInternal() :
 _old_adlib_instruments(false),
+_native_mt32(false),
 _enable_multi_midi(false),
 _midi_adlib(0),
 _midi_native(0),
@@ -1085 +1086 @@
                 break;
 
         case IMuse::PROP_NATIVE_MT32:
+                _native_mt32 = (value > 0);
                 Instrument::nativeMT32(value > 0);
                 break;
 
@@ -1500 +1502 @@
                 return;
         set_pitchbend(0);
         _pitchbend_factor = value;
-        if (_mc)
-                _mc->pitchBendFactor(_pitchbend_factor);
+        if (_mc) {
+                if (!_player->_se->isNativeMT32()) {
+                        _mc->pitchBendFactor(_pitchbend_factor);
+                } else if (_mc->getNumber() < 8) {
+                        byte buffer[] = { 0x41, 0x00, 0x16, 0x12, 0x03, 0x00, 0x04, 0x00, 0x00 };
+                        buffer[1] = _mc->getNumber();
+                        buffer[7] = value;
+                        buffer[8] = (0 - buffer[4] - buffer[5] - buffer[6] - buffer[7]) & 0x3F;
+                        _mc->device()->sysEx(buffer, 9);
+                }
+        }
 }
 
 void Part::set_onoff(bool on) {

scummvm/scumm/imuse_internal.h

@@ -350 +350 @@
 
 protected:
         bool _old_adlib_instruments;
+        bool _native_mt32;
         bool _enable_multi_midi;
         MidiDriver *_midi_adlib;
         MidiDriver *_midi_native;
@@ -445 +446 @@
         void reallocateMidiChannels(MidiDriver *midi);
         void setGlobalAdlibInstrument(byte slot, byte *data);
         void copyGlobalAdlibInstrument(byte slot, Instrument *dest);
+        bool isNativeMT32() { return _native_mt32; }
 
         // IMuse interface