From 44e25a6ad5b37c1c42944885c8d8cc4f9816b831 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 28 Sep 2009 13:45:58 +0200 Subject: [PATCH 1/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 2/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; From 186378a4f1c28dbc6c1547b71d3954c4aaf28642 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 30 Sep 2009 02:08:18 -0700 Subject: [PATCH 3/4] Fixed segfault when libmp3lame.so is not found Applied pitanga's patch against lame_library - Fixes missing return statement if the library was not found. (Thanks pitanga) --- src/core/lame_library.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/lame_library.cpp b/src/core/lame_library.cpp index 7e80136ee..beed0b451 100644 --- a/src/core/lame_library.cpp +++ b/src/core/lame_library.cpp @@ -44,6 +44,7 @@ LameLibrary::LameLibrary() : QMessageBox::Ok | QMessageBox::Default ); delete m_lameLib; m_lameLib = NULL; + return; } // grab the functions and stuff we need @@ -155,6 +156,7 @@ LameLibrary::LameLibrary() : m_lameLib->unload(); delete m_lameLib; m_lameLib = NULL; + return; } } From f6507b52ee722a9594c6185b9b8dbabdf682e67a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 30 Sep 2009 07:49:01 -0700 Subject: [PATCH 4/4] fixes segfault when importing a midi file pitanga's patch - fixes a segfault when trying to import a midi file without a default soundfont set. --- plugins/midi_import/MidiImport.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/midi_import/MidiImport.cpp b/plugins/midi_import/MidiImport.cpp index 49924934a..15463c043 100644 --- a/plugins/midi_import/MidiImport.cpp +++ b/plugins/midi_import/MidiImport.cpp @@ -229,9 +229,11 @@ public: if( it_inst ) { isSF2 = true; - it_inst->loadResource( - configManager::inst()-> - defaultSoundfont() ); + if( configManager::inst()->defaultSoundfont() ) + { + it_inst->loadResource( + configManager::inst()->defaultSoundfont() ); + } it_inst->childModel( "bank" )->setValue( 0 ); it_inst->childModel( "patch" )->setValue( 0 ); }