hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of ssh://pgib@lmms.git.sourceforge.net/gitroot/lmms/lmms into fx-mixer-rework

Browse Source
This commit is contained in:
Paul Giblock
2009-09-30 03:14:57 -04:00
parent db6164ca91 2622edd140
commit 147844b388
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/vst_base/remote_vst_plugin.cpp
View File

@@ -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();

2
plugins/zynaddsubfx/CMakeLists.txt
View File

@@ -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})