From 0f28295ac7df74364f6b97286a948be571f56a04 Mon Sep 17 00:00:00 2001 From: Nikos Chantziaras Date: Wed, 23 Sep 2009 14:27:15 +0200 Subject: [PATCH 1/4] ZynAddSubFX: link fftw3f after ZASF core libs Commit 3c18e436cddc123347a9dedbb8e71346a26ecd05 makes it impossible to build LMMS with embedded ZynAddSubFX if "-Wl,--as-needed" is used in LINKER_FLAGS during the link step of RemoteZynAddSubFx: Linking CXX executable RemoteZynAddSubFx libZynAddSubFxCore.so: undefined reference to `fftwf_plan_r2r_1d' libZynAddSubFxCore.so: undefined reference to `fftwf_execute' libZynAddSubFxCore.so: undefined reference to `fftwf_destroy_plan' This happens because fftw3f, which is a system lib, is linked to before the ZASF core libs when linking RemoteZynAddSubFx. With "--as-needed", correct library order matters. --- plugins/zynaddsubfx/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt index d583a8539..763112f58 100644 --- a/plugins/zynaddsubfx/CMakeLists.txt +++ b/plugins/zynaddsubfx/CMakeLists.txt @@ -90,7 +90,7 @@ add_subdirectory(src/DSP) add_subdirectory(src/Samples) ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${MXML_SRC}) -TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${FFTW3F_LIBRARIES} ${ZASF_CORE_LIBS} -lz -lpthread) +TARGET_LINK_LIBRARIES(ZynAddSubFxCore ${ZASF_CORE_LIBS} ${FFTW3F_LIBRARIES} -lz -lpthread) IF(LMMS_BUILD_WIN32) TARGET_LINK_LIBRARIES(ZynAddSubFxCore -lwsock32) INSTALL(TARGETS ZynAddSubFxCore DESTINATION ${PLUGIN_DIR}) From c896488e139daaa535394ebafe120a53a1a5f050 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Wed, 23 Sep 2009 23:24:12 +0200 Subject: [PATCH 2/4] Moved ChangeLog file to ChangeLog.old As it's not maintained anymore but should be kept for archival reasons I moved ChangeLog to ChangeLog.old. --- ChangeLog => ChangeLog.old | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ChangeLog => ChangeLog.old (100%) diff --git a/ChangeLog b/ChangeLog.old similarity index 100% rename from ChangeLog rename to ChangeLog.old From 44e25a6ad5b37c1c42944885c8d8cc4f9816b831 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 28 Sep 2009 13:45:58 +0200 Subject: [PATCH 3/4] RemoteVstPlugin: removed plugin dispatching in hostCallback There's no need to call plugin dispatcher in hostCallback. It makes plugins like Garritan Personal Orchestra 4 lock up. After removing these calls the affected plugins work. --- plugins/vst_base/remote_vst_plugin.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/plugins/vst_base/remote_vst_plugin.cpp b/plugins/vst_base/remote_vst_plugin.cpp index e2c96e971..0f9ba6c23 100644 --- a/plugins/vst_base/remote_vst_plugin.cpp +++ b/plugins/vst_base/remote_vst_plugin.cpp @@ -1069,14 +1069,10 @@ VstIntPtr RemoteVstPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode, case audioMasterGetSampleRate: SHOW_CALLBACK( "amc: audioMasterGetSampleRate\n" ); - __plugin->pluginDispatch( effSetSampleRate, - 0, 0, NULL, (float)__plugin->sampleRate() ); return __plugin->sampleRate(); case audioMasterGetBlockSize: SHOW_CALLBACK( "amc: audioMasterGetBlockSize\n" ); - __plugin->pluginDispatch( effSetBlockSize, - 0, __plugin->bufferSize() ); return __plugin->bufferSize(); From 2622edd140fad7ebb44e70cefbba4058fcaa52f6 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 28 Sep 2009 10:02:08 -0400 Subject: [PATCH 4/4] Fix issue with knobs in 3xOsc and AudioFilePro. The knobs were broken because the classnames of these instruments was changed without properly changing the selectors in the style.css --- data/themes/cusis/style.css | 6 +++--- data/themes/default/style.css | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/data/themes/cusis/style.css b/data/themes/cusis/style.css index 5c61a6998..110e386d2 100644 --- a/data/themes/cusis/style.css +++ b/data/themes/cusis/style.css @@ -139,7 +139,7 @@ QToolBar { } -fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton { +FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { font-size: 10px; } @@ -149,7 +149,7 @@ timeLine { /* Plugins */ -tripleOscillatorView knob { +TripleOscillatorView knob { color: rgb(1, 114, 216); qproperty-outerColor: rgb(0, 0, 0); qproperty-innerRadius: 1; @@ -171,7 +171,7 @@ kickerInstrumentView knob { } -audioFileProcessorView knob { +AudioFileProcessorView knob { color: rgb(240, 147, 14); qproperty-outerColor: rgb(30, 35, 37); qproperty-innerRadius: 4; diff --git a/data/themes/default/style.css b/data/themes/default/style.css index b584aa4d8..30091d6fe 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -150,7 +150,7 @@ QToolButton:checked { padding: 3px 0px 0px 3px; } -fxMixerView QPushButton, effectRackView QPushButton, controllerRackView QPushButton { +FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { font-size: 10px; } @@ -160,7 +160,7 @@ timeLine { /* Plugins */ -tripleOscillatorView knob { +TripleOscillatorView knob { color: rgb(1, 114, 216); qproperty-outerColor: rgb(0, 0, 0); qproperty-innerRadius: 1; @@ -182,7 +182,7 @@ kickerInstrumentView knob { } -audioFileProcessorView knob { +AudioFileProcessorView knob { color: rgb(240, 147, 14); qproperty-outerColor: rgb(30, 35, 37); qproperty-innerRadius: 4;