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

0
ChangeLog → ChangeLog.old
View File

6
data/themes/cusis/style.css
View File

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

6
data/themes/default/style.css
View File

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

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