summaryrefslogtreecommitdiff
path: root/muse2/synti/fluid/fluid.cpp
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-15 18:21:23 +0000
commit27b7bf6815cda7abb67026c37b3e44daee1803cb (patch)
tree0b9d1c0bc84ac7ff8032e707f2b5fb4e0aaabb5c /muse2/synti/fluid/fluid.cpp
parent2d6f113a10eb485694e20a78500f650776d701e3 (diff)
merged with trunk
Diffstat (limited to 'muse2/synti/fluid/fluid.cpp')
-rw-r--r--muse2/synti/fluid/fluid.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/muse2/synti/fluid/fluid.cpp b/muse2/synti/fluid/fluid.cpp
index 48d68fb4..8a2fd13b 100644
--- a/muse2/synti/fluid/fluid.cpp
+++ b/muse2/synti/fluid/fluid.cpp
@@ -154,6 +154,8 @@ bool ISynth::setController(int ch, int ctrl, int val)
break;
case MusECore::CTRL_PITCH:
+ // MusE's range is from -8192 to +8191, fluidsynth seems to be [0, 16384]
+ val +=8192;
fluid_synth_pitch_bend (_fluidsynth, ch, val);
break;
@@ -378,8 +380,9 @@ bool ISynth::processEvent(const MusECore::MidiPlayEvent& ev)
{
switch(ev.type()) {
case MusECore::ME_CONTROLLER:
- setController(ev.channel(), ev.dataA(), ev.dataB());
- return true;
+ setController(ev.channel(), ev.dataA(), ev.dataB());
+ //return true; // ??
+ break;
case MusECore::ME_NOTEON:
return playNote(ev.channel(), ev.dataA(), ev.dataB());
case MusECore::ME_NOTEOFF: