merged with trunk

5 files changed, 19 insertions, 7 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:
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index fded650d..a42954f3 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -488,7 +488,8 @@ bool FluidSynth::processEvent(const MusECore::MidiPlayEvent& ev)
                               printf("%x ", ev.data()[i]);
                         }
                   setController(ev.channel(), ev.dataA(), ev.dataB(), false);
-                  return true;
+                  //return true;  // ?? 
+                  break;            
             case MusECore::ME_NOTEON:
                   return playNote(ev.channel(), ev.dataA(), ev.dataB());
             case MusECore::ME_NOTEOFF:
diff --git a/muse2/synti/simpledrums2/CMakeLists.txt b/muse2/synti/simpledrums2/CMakeLists.txt
index bf0c33d8..172ce616 100644
--- a/muse2/synti/simpledrums2/CMakeLists.txt
+++ b/muse2/synti/simpledrums2/CMakeLists.txt
@@ -74,9 +74,14 @@ set (FILES_TO_TRANSLATE
 #   libsimpledrums.so
 # - use precompiled header files
 #
+
+if ( x${CMAKE_BUILD_TYPE} STREQUAL xrelease )
+      SET(SIMPLEDRUMS_OPTFLAGS "-O6")
+endif ( x${CMAKE_BUILD_TYPE} STREQUAL xrelease )
+
 set_target_properties ( simpledrums
       PROPERTIES PREFIX ""
-      COMPILE_FLAGS "-O6 -fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
+      COMPILE_FLAGS "${SIMPLEDRUMS_OPTFLAGS} -fvisibility=hidden -include ${PROJECT_BINARY_DIR}/all-pic.h"
       )
 
 ##
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index c7c2c85f..945abbb0 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -366,7 +366,8 @@ bool SimpleSynth::processEvent(const MusECore::MidiPlayEvent& ev)
                               printf("%x ", ev.data()[i]);
                         }
                   setController(ev.channel(), ev.dataA(), ev.dataB(), false);
-                  return true;
+                  //return true;  // ??
+                  return false;   
             case MusECore::ME_NOTEON:
                   return playNote(ev.channel(), ev.dataA(), ev.dataB());
             case MusECore::ME_NOTEOFF:
diff --git a/muse2/synti/simpledrums2/ssplugingui.cpp b/muse2/synti/simpledrums2/ssplugingui.cpp
index 5b6e57b6..4ccb9bcc 100644
--- a/muse2/synti/simpledrums2/ssplugingui.cpp
+++ b/muse2/synti/simpledrums2/ssplugingui.cpp
@@ -536,8 +536,10 @@ SS_PluginGui::SS_PluginGui(QWidget* parent)
             connect(pluginFronts[i], SIGNAL(sizeChanged(int, int)), SLOT(pluginFrontSizeChanged(int, int)));
             connect(pluginFronts[i], SIGNAL(effectParameterChanged(int, int, int)), simplesynthgui_ptr, SLOT(effectParameterChanged(int, int, int)));
             }
-      setMinimumSize(QSize(SS_PLUGINGUI_WIDTH, geometry().height()));
-      setMaximumSize(QSize(SS_PLUGINGUI_MAX_WIDTH, geometry().height()));
+            
+      // FIXME: These are causing window height to be fixed way too small - can't see anything. Why? It was working before. Tim p4.0.49
+      //setMinimumSize(QSize(SS_PLUGINGUI_WIDTH, geometry().height()));
+      //setMaximumSize(QSize(SS_PLUGINGUI_MAX_WIDTH, geometry().height()));
       }