Ticket #1245: mt32-bend-range.diff

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
 

scumm\imuse.cpp

@@ -43 +43 @@
 
 IMuseInternal::IMuseInternal() :
 _old_adlib_instruments(false),
+_native_mt32(false),
 _enable_multi_midi(false),
 _midi_adlib(0),
 _midi_native(0),
@@ -1078 +1079 @@
                 break;
 
         case IMuse::PROP_NATIVE_MT32:
+                _native_mt32 = (value > 0);
                 Instrument::nativeMT32(value > 0);
                 break;
 
@@ -1419 +1421 @@
 }
 
 void Part::set_pitchbend(int value) {
-        _pitchbend = value;
+        if (!_player->_se->isNativeMT32())
+                _pitchbend = value;
+        else
+                _pitchbend = value * _pitchbend_factor / 12;
         if (_mc) {
                 _mc->pitchBend(clamp(_pitchbend +
                                                 (_detune_eff * 64 / 12) +
@@ -1493 +1498 @@
                 return;
         set_pitchbend(0);
         _pitchbend_factor = value;
-        if (_mc)
-                _mc->pitchBendFactor(_pitchbend_factor);
+        if (_mc) {
+                if (!_player->_se->isNativeMT32())
+                        _mc->pitchBendFactor(_pitchbend_factor);
+        }
 }
 
 void Part::set_onoff(bool on) {
@@ -1615 +1622 @@
 
 void Part::sendAll() {
         if (!clearToTransmit()) return;
-        _mc->pitchBendFactor(_pitchbend_factor);
+        if (!_player->_se->isNativeMT32())
+                _mc->pitchBendFactor(_pitchbend_factor);
         _mc->pitchBend(clamp(_pitchbend +
                        (_detune_eff * 64 / 12) +
                        (_transpose_eff * 8192 / 12), -8192, 8191));