Revert "Merge pull request #4538 from MichaelFroelich/68456_fixesPitc…

…hBends" This reverts commit 1d5ae8a.
musescore · May 22, 2019 · 740c428 · 740c428
1 parent ada5188
commit 740c428
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 19 deletions.
diff --git a/fluid/chan.cpp b/fluid/chan.cpp
@@ -21,7 +21,6 @@
 #include "fluid.h"
 #include "sfont.h"
 #include "gen.h"
-#include "synthesizer/event.h"
 
 namespace FluidS {
 
@@ -70,7 +69,7 @@ void Channel::initCtrl()
       key_pressure     = 0;
       channel_pressure = 0;
       pitch_bend       = 0x2000; // Range is 0x4000, pitch bend wheel starts in centered position
-      pitch_wheel_sensitivity = PITCH_BEND_SENSITIVITY; /* four semi-tones, default for many DAWs */
+      pitch_wheel_sensitivity = 12; /* twelve semi-tones */
       bank_msb         = 0;
 
       for (int i = 0; i < GEN_LAST; i++) {

diff --git a/libmscore/rendermidi.cpp b/libmscore/rendermidi.cpp
@@ -331,9 +331,9 @@ static void collectNote(EventMap* events, int channel, const Note* note, int vel
                   int pitch = pitchValue.pitch;
 
                   if (pitchIndex == 0 && (pitch == nextPitch.pitch)) {
-                        int midiPitch = midiBendPitch(pitch);
-                        int msb = (midiPitch / 128);
-                        int lsb = (midiPitch % 128);
+                        int midiPitch = (pitch * 16384) / 1200 + 8192;
+                        int msb = midiPitch / 128;
+                        int lsb = midiPitch % 128;
                         NPlayEvent ev(ME_PITCHBEND, channel, lsb, msb);
                         ev.setOriginatingStaff(staffIdx);
                         events->insert(std::pair<int, NPlayEvent>(lastPointTick, ev));
@@ -358,7 +358,7 @@ static void collectNote(EventMap* events, int channel, const Note* note, int vel
                         int p = pitch + dx * pitchDelta / tickDelta;
 
                         // We don't support negative pitch, but Midi does. Let's center by adding 8192.
-                        int midiPitch = midiBendPitch(p);
+                        int midiPitch = (p * 16384) / 1200 + 8192;
                         // Representing pitch as two bytes
                         int msb = midiPitch / 128;
                         int lsb = midiPitch % 128;

diff --git a/mscore/exportmidi.cpp b/mscore/exportmidi.cpp
@@ -258,7 +258,7 @@ bool ExportMidi::write(QIODevice* device, bool midiExpandRepeats, bool exportRPN
                                     // set pitch bend sensitivity to 12 semitones:
                                     track.insert(0, MidiEvent(ME_CONTROLLER, channel, CTRL_LRPN, 0));
                                     track.insert(0, MidiEvent(ME_CONTROLLER, channel, CTRL_HRPN, 0));
-                                    track.insert(0, MidiEvent(ME_CONTROLLER, channel, CTRL_HDATA, PITCH_BEND_SENSITIVITY));
+                                    track.insert(0, MidiEvent(ME_CONTROLLER, channel, CTRL_HDATA, 12));
 
                                     // reset fine tuning
                                     /*track.insert(0, MidiEvent(ME_CONTROLLER, channel, CTRL_LRPN, 1));

diff --git a/mscore/seq.cpp b/mscore/seq.cpp
@@ -987,14 +987,14 @@ void Seq::initInstruments(bool realTime)
                   if (realTime) {
                         putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_LRPN, 0));
                         putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HRPN, 0));
-                        putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HDATA, PITCH_BEND_SENSITIVITY));
+                        putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HDATA,12));
                         putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_LRPN, 127));
                         putEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HRPN, 127));
                         }
                   else {
                         sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_LRPN, 0));
                         sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HRPN, 0));
-                        sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HDATA, PITCH_BEND_SENSITIVITY));
+                        sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HDATA,12));
                         sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_LRPN, 127));
                         sendEvent(NPlayEvent(ME_CONTROLLER, channel->channel(), CTRL_HRPN, 127));
                         }

diff --git a/mtest/libmscore/midi/testArpeggio-ref.mid b/mtest/libmscore/midi/testArpeggio-ref.mid
diff --git a/mtest/libmscore/midi/testBends1-ref.mid b/mtest/libmscore/midi/testBends1-ref.mid
diff --git a/mtest/libmscore/midi/testBends2-ref.mid b/mtest/libmscore/midi/testBends2-ref.mid
diff --git a/mtest/libmscore/midi/testInitialKeySigThenRepeatToMeas2-ref.mid b/mtest/libmscore/midi/testInitialKeySigThenRepeatToMeas2-ref.mid
diff --git a/mtest/libmscore/midi/testRepeatsWithKeySigs-ref.mid b/mtest/libmscore/midi/testRepeatsWithKeySigs-ref.mid
diff --git a/mtest/libmscore/midi/testRepeatsWithKeySigsExceptFirstMeas-ref.mid b/mtest/libmscore/midi/testRepeatsWithKeySigsExceptFirstMeas-ref.mid
diff --git a/mtest/libmscore/midi/testSingleNoteDynamics-ref.mid b/mtest/libmscore/midi/testSingleNoteDynamics-ref.mid
diff --git a/mtest/libmscore/midi/testTimeStretchFermata-ref.mid b/mtest/libmscore/midi/testTimeStretchFermata-ref.mid
diff --git a/mtest/libmscore/midi/testVoltaDynamic-ref.mid b/mtest/libmscore/midi/testVoltaDynamic-ref.mid
diff --git a/mtest/libmscore/midi/testVoltaStaffText-ref.mid b/mtest/libmscore/midi/testVoltaStaffText-ref.mid
diff --git a/mtest/libmscore/midi/testVoltaTemp-ref.mid b/mtest/libmscore/midi/testVoltaTemp-ref.mid
diff --git a/synthesizer/event.cpp b/synthesizer/event.cpp
@@ -204,8 +204,6 @@ bool MidiCoreEvent::isChannelEvent() const
       // return false;
       }
 
-
-
 //---------------------------------------------------------
 //   Event::write
 //---------------------------------------------------------
@@ -356,10 +354,6 @@ QString midiMetaName(int meta)
       return QString(s);
       }
 
-int midiBendPitch(int pitch) {
-      return (pitch * 8192) / (PITCH_BEND_SENSITIVITY * 100) + 8192;
-      }
-
 //---------------------------------------------------------
 // insert
 //---------------------------------------------------------

diff --git a/synthesizer/event.h b/synthesizer/event.h
@@ -22,9 +22,6 @@ class XmlWriter;
 
 enum class BeatType : char;
 
-// 4 is the default for the majority of synthesisers, aka VSTis
-const int PITCH_BEND_SENSITIVITY = 4;
-
 //---------------------------------------------------------
 //   Event types
 //---------------------------------------------------------
@@ -336,7 +333,6 @@ typedef EventList::const_iterator ciEvent;
 
 extern QString midiMetaName(int meta);
 
-extern int midiBendPitch(int pitch);
 }
 #endif