Ticket #8064: pitchbend.diff

scummvm/scumm/imuse.cpp

@@ -3110 +3110 @@
 
 void Part::set_pitchbend(int value)
 {
-        _pitchbend = value * _pitchbend_factor >> 6;
+        _pitchbend = value;
         changed(IMuseDriver::pcMod);
 }
 
@@ -3993 +3993 @@
         if (what & pcMod) {
                 for (mc = part->_mc->adl(); mc; mc = mc->_next) {
                         adlib_note_on(mc->_channel, mc->_note + part->_transpose_eff,
-                                                                                part->_pitchbend + part->_detune_eff);
+                                      (part->_pitchbend * part->_pitchbend_factor >> 6) + part->_detune_eff);
                 }
         }
 
@@ -4278 +4278 @@
 
         if (_midi_pitchbend_last[chan] != pitchbend) {
                 _midi_pitchbend_last[chan] = pitchbend;
-                tmp = (pitchbend << 2) + 0x2000;
+                tmp = pitchbend + 0x2000;
                 _md->send(((tmp >> 7) & 0x7F) << 16 | (tmp & 0x7F) << 8 | 0xE0 | chan);
         }
 }
@@ -4570 +4570 @@
 
         if (what & pcMod)
                 midiPitchBend(mc->_chan,
-                                                                        clamp(part->_pitchbend + part->_detune_eff +
-                                                                                                (part->_transpose_eff << 7), -2048, 2047));
+                              clamp(part->_pitchbend +
+                                                (part->_detune_eff * 64 / 12) +
+                                    (part->_transpose_eff * 8192 / 12), -8192, 8191));
 
         if (what & pcVolume)
                 midiVolume(mc->_chan, part->_vol_eff);

scummvm/sound/mididrv.cpp

@@ -87 +87 @@
 }
 
 void CALLBACK MidiDriver_WIN::midi_callback(HMIDIOUT hmo, UINT wMsg,
-                                                                                                                                                                                DWORD dwInstance, DWORD dwParam1, DWORD dwParam2)
+                                            DWORD dwInstance, DWORD dwParam1, DWORD dwParam2)
 {
 
         switch (wMsg) {
@@ -111 +111 @@
                 MMRESULT res = midiOutOpen((HMIDIOUT *) & _mo, MIDI_MAPPER, NULL, NULL, 0);
                 if (res != MMSYSERR_NOERROR)
                         check_error(res);
+
+                // Send initial pitch bend sensitivity values for +/- 12 semitones.
+                // For information on control change registered parameters,
+                // which includes the Pitch Bend sensitivity settings,
+                // visit http://www.midi.org/about-midi/table3.htm,
+                // Table 3a.
+                int chan;
+                for (chan = 0; chan < 16; ++chan) {
+                        send(( 0 << 16) | (101 << 8) | (0xB0 | chan));
+                        send(( 0 << 16) | (100 << 8) | (0xB0 | chan));
+                        send((12 << 16) | (  6 << 8) | (0xB0 | chan));
+                        send(( 0 << 16) | ( 38 << 8) | (0xB0 | chan));
+                } // next for
         } else {
                 /* streaming mode */
                 MIDIPROPTIMEDIV mptd;
                 UINT _midi_device_id = 0;
 
                 check_error(midiStreamOpen(&_ms, &_midi_device_id, 1,
-                                                                                                                         (uint32)midi_callback, (uint32)this, CALLBACK_FUNCTION));
+                                   (uint32)midi_callback, (uint32)this, CALLBACK_FUNCTION));
 
                 prepare();