From 27b7bf6815cda7abb67026c37b3e44daee1803cb Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Thu, 15 Mar 2012 18:21:23 +0000 Subject: merged with trunk --- muse2/synti/simpledrums2/CMakeLists.txt | 7 ++++++- muse2/synti/simpledrums2/simpledrums.cpp | 3 ++- muse2/synti/simpledrums2/ssplugingui.cpp | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) (limited to 'muse2/synti/simpledrums2') 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())); } -- cgit v1.2.3