Ticket #8064: pitchbend3.diff

scummvm/scumm/imuse.cpp

@@ -4550 +4550 @@
 void IMuseGM::midiPitchBendFactor (byte chan, byte factor) {
         if (_midi_pitchbend_factor_last[chan] != factor) {
                 _midi_pitchbend_factor_last[chan] = factor;
-                _md->setPitchBendRange (factor); // For high-level semantic drivers (such as QTMA)
+                _md->setPitchBendRange (chan, factor); // For high-level semantic drivers (such as QTMA)
                 _md->send((   0   << 16) | (101 << 8) | (0xB0 | chan));
                 _md->send((   0   << 16) | (100 << 8) | (0xB0 | chan));
                 _md->send((factor << 16) | (  6 << 8) | (0xB0 | chan));

scummvm/sound/mididrv.cpp

@@ -45 +45 @@
         void send(uint32 b);
         void pause(bool pause);
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 
 private:
         struct MyMidiHdr {
@@ -305 +305 @@
         void send(uint32 b);
         void pause(bool pause);
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 
 private:
         enum {
@@ -517 +517 @@
         void send(uint32 b);
         void pause(bool pause);
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 
 private:
         StreamCallback *_stream_proc;
@@ -655 +655 @@
         void send(uint32 b);
         void pause(bool pause) { }
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range);
+        void setPitchBendRange (byte channel, uint range);
 
 private:
         NoteAllocator qtNoteAllocator;
@@ -817 +817 @@
                         // multiply it by a factor. If all was right, the factor would be 3/8, but for
                         // mysterious reasons the actual factor we have to use is more like 1/32 or 3/64.
                         // Maybe the QT docs are right, and 
-                        long theBend = ((long)midiCmd[1] | (long)(midiCmd[2] << 7));
-                        _pitchbend[chanID] = theBend;
-                        theBend = (theBend - 0x2000) * _pitchbend_range[channel] / 32;
+                        _pitchbend[chanID] = ((uint16) midiCmd[1] | (uint16) (midiCmd[2] << 7));
+                        theBend = ((long) _pitchbend[chanID] - 0x2000) * _pitchbend_range[chanID] / 32;
 
                         NASetController(qtNoteAllocator, qtNoteChannel[chanID], kControllerPitchBend, theBend);
                 }
@@ -832 +831 @@
         }
 }
 
-void MidiDriver_QT::setPitchBendRange (channel, range)
+void MidiDriver_QT::setPitchBendRange (byte channel, uint range)
 {
         if (_pitchbend_range[channel] == range)
                 return;
@@ -865 +864 @@
         void send(uint32 b);
         void pause(bool pause);
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 
 private:
         AudioUnit au_MusicDevice;
@@ -988 +987 @@
         void send(uint32 b) { }
         void pause(bool pause) { }
         void set_stream_callback(void *param, StreamCallback *sc) { }
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 private:
 };
 
@@ -1061 +1060 @@
         void send(uint32 b);
         void pause(bool pause);
         void set_stream_callback(void *param, StreamCallback *sc);
-        void setPitchBendRange (uint range) { }
+        void setPitchBendRange (byte channel, uint range) { }
 
 private:
         void send_event(int do_flush);

scummvm/sound/mididrv.h

@@ -99 +99 @@
         static const char *get_error_name(int error_code);
 
         // HIGH-LEVEL SEMANTIC METHODS
-        virtual void setPitchBendRange (uint range) = 0;
+        virtual void setPitchBendRange (byte channel, uint range) = 0;
 };