From 408c98f4736e7a85a551226d8a617214b32fef08 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sun, 23 Feb 2014 15:08:01 +0100 Subject: [PATCH] VstEffect: fixed some messages --- plugins/CMakeLists.txt | 2 +- .../{vst_effect => VstEffect}/CMakeLists.txt | 0 .../{vst_effect => VstEffect}/VstEffect.cpp | 24 +++++++----------- plugins/{vst_effect => VstEffect}/VstEffect.h | 0 .../VstEffectControlDialog.cpp | 0 .../VstEffectControlDialog.h | 0 .../VstEffectControls.cpp | 0 .../VstEffectControls.h | 0 .../VstSubPluginFeatures.cpp | 0 .../VstSubPluginFeatures.h | 0 plugins/{vst_effect => VstEffect}/logo.png | Bin 11 files changed, 10 insertions(+), 16 deletions(-) rename plugins/{vst_effect => VstEffect}/CMakeLists.txt (100%) rename plugins/{vst_effect => VstEffect}/VstEffect.cpp (87%) rename plugins/{vst_effect => VstEffect}/VstEffect.h (100%) rename plugins/{vst_effect => VstEffect}/VstEffectControlDialog.cpp (100%) rename plugins/{vst_effect => VstEffect}/VstEffectControlDialog.h (100%) rename plugins/{vst_effect => VstEffect}/VstEffectControls.cpp (100%) rename plugins/{vst_effect => VstEffect}/VstEffectControls.h (100%) rename plugins/{vst_effect => VstEffect}/VstSubPluginFeatures.cpp (100%) rename plugins/{vst_effect => VstEffect}/VstSubPluginFeatures.h (100%) rename plugins/{vst_effect => VstEffect}/logo.png (100%) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index bbc923a83..86dad9230 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_SUBDIRECTORY(stk) ADD_SUBDIRECTORY(triple_oscillator) ADD_SUBDIRECTORY(vestige) ADD_SUBDIRECTORY(vst_base) -ADD_SUBDIRECTORY(vst_effect) +ADD_SUBDIRECTORY(VstEffect) ADD_SUBDIRECTORY(waveshaper) ADD_SUBDIRECTORY(vibed) ADD_SUBDIRECTORY(zynaddsubfx) diff --git a/plugins/vst_effect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt similarity index 100% rename from plugins/vst_effect/CMakeLists.txt rename to plugins/VstEffect/CMakeLists.txt diff --git a/plugins/vst_effect/VstEffect.cpp b/plugins/VstEffect/VstEffect.cpp similarity index 87% rename from plugins/vst_effect/VstEffect.cpp rename to plugins/VstEffect/VstEffect.cpp index 9676f83af..cca766b86 100644 --- a/plugins/vst_effect/VstEffect.cpp +++ b/plugins/VstEffect/VstEffect.cpp @@ -40,8 +40,7 @@ Plugin::Descriptor PLUGIN_EXPORT vsteffect_plugin_descriptor = STRINGIFY( PLUGIN_NAME ), "VST Effect", QT_TRANSLATE_NOOP( "pluginBrowser", - "plugin for using arbitrary VST-effects " - "inside LMMS." ), + "plugin for using arbitrary VST effects inside LMMS." ), "Tobias Doerffel ", 0x0200, Plugin::Effect, @@ -127,8 +126,7 @@ void VstEffect::openPlugin( const QString & _plugin ) { textFloat * tf = textFloat::displayMessage( VstPlugin::tr( "Loading plugin" ), - VstPlugin::tr( - "Please wait while loading VST-plugin..." ), + VstPlugin::tr( "Please wait while loading VST plugin..." ), PLUGIN_NAME::getIconPixmap( "logo", 24, 24 ), 0 ); m_pluginMutex.lock(); m_plugin = new VstPlugin( _plugin ); @@ -138,21 +136,17 @@ void VstEffect::openPlugin( const QString & _plugin ) closePlugin(); delete tf; QMessageBox::information( NULL, - VstPlugin::tr( "Failed loading VST-plugin" ), - VstPlugin::tr( "The VST-plugin %1 could not " - "be loaded for some reason.\n" - "If it runs with other VST-" - "software under Linux, please " - "contact an LMMS-developer!" - ).arg( _plugin ), - QMessageBox::Ok ); + VstPlugin::tr( "Failed loading VST plugin" ), + VstPlugin::tr( "The VST plugin %1 could not be loaded for some reason." ).arg( _plugin ), + QMessageBox::Ok ); return; } - VstPlugin::connect( engine::getSong(), - SIGNAL( tempoChanged( bpm_t ) ), - m_plugin, SLOT( setTempo( bpm_t ) ) ); + + VstPlugin::connect( engine::getSong(), SIGNAL( tempoChanged( bpm_t ) ), m_plugin, SLOT( setTempo( bpm_t ) ) ); m_plugin->setTempo( engine::getSong()->getTempo() ); + m_pluginMutex.unlock(); + delete tf; m_key.attributes["file"] = _plugin; diff --git a/plugins/vst_effect/VstEffect.h b/plugins/VstEffect/VstEffect.h similarity index 100% rename from plugins/vst_effect/VstEffect.h rename to plugins/VstEffect/VstEffect.h diff --git a/plugins/vst_effect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp similarity index 100% rename from plugins/vst_effect/VstEffectControlDialog.cpp rename to plugins/VstEffect/VstEffectControlDialog.cpp diff --git a/plugins/vst_effect/VstEffectControlDialog.h b/plugins/VstEffect/VstEffectControlDialog.h similarity index 100% rename from plugins/vst_effect/VstEffectControlDialog.h rename to plugins/VstEffect/VstEffectControlDialog.h diff --git a/plugins/vst_effect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp similarity index 100% rename from plugins/vst_effect/VstEffectControls.cpp rename to plugins/VstEffect/VstEffectControls.cpp diff --git a/plugins/vst_effect/VstEffectControls.h b/plugins/VstEffect/VstEffectControls.h similarity index 100% rename from plugins/vst_effect/VstEffectControls.h rename to plugins/VstEffect/VstEffectControls.h diff --git a/plugins/vst_effect/VstSubPluginFeatures.cpp b/plugins/VstEffect/VstSubPluginFeatures.cpp similarity index 100% rename from plugins/vst_effect/VstSubPluginFeatures.cpp rename to plugins/VstEffect/VstSubPluginFeatures.cpp diff --git a/plugins/vst_effect/VstSubPluginFeatures.h b/plugins/VstEffect/VstSubPluginFeatures.h similarity index 100% rename from plugins/vst_effect/VstSubPluginFeatures.h rename to plugins/VstEffect/VstSubPluginFeatures.h diff --git a/plugins/vst_effect/logo.png b/plugins/VstEffect/logo.png similarity index 100% rename from plugins/vst_effect/logo.png rename to plugins/VstEffect/logo.png