From d6ae46eaddbd60027ecd8a550d630a7fb8702b59 Mon Sep 17 00:00:00 2001 From: Hyunin Song Date: Sun, 20 May 2018 15:45:50 +0900 Subject: [PATCH] Allow controlling VST effects without own GUI --- plugins/VstEffect/VstEffectControlDialog.cpp | 8 ++++---- plugins/VstEffect/VstEffectControls.cpp | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/plugins/VstEffect/VstEffectControlDialog.cpp b/plugins/VstEffect/VstEffectControlDialog.cpp index 14866ec56d6..84548bfde17 100644 --- a/plugins/VstEffect/VstEffectControlDialog.cpp +++ b/plugins/VstEffect/VstEffectControlDialog.cpp @@ -62,14 +62,14 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : embed_vst = m_plugin->embedMethod() != "none"; if (embed_vst) { - if (! m_plugin->pluginWidget()) { + if (m_plugin->hasEditor() && ! m_plugin->pluginWidget()) { m_plugin->createUI(this); } m_pluginWidget = m_plugin->pluginWidget(); } } - if ( m_plugin && (!embed_vst || m_pluginWidget) ) + if (m_plugin) { setWindowTitle( m_plugin->name() ); @@ -218,7 +218,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : int newSize = 0; - if (embed_vst) { + if (m_pluginWidget) { newSize = m_pluginWidget->width() + 20; } newSize = std::max(newSize, 250); @@ -234,7 +234,7 @@ VstEffectControlDialog::VstEffectControlDialog( VstEffectControls * _ctl ) : l->addItem( new QSpacerItem( newSize - 20, 30, QSizePolicy::Fixed, QSizePolicy::Fixed ), 1, 0 ); l->addWidget( resize, 2, 0, 1, 1, Qt::AlignCenter ); - if (embed_vst) { + if (m_pluginWidget) { l->addWidget( m_pluginWidget, 3, 0, 1, 1, Qt::AlignCenter ); } l->setRowStretch( 5, 1 ); diff --git a/plugins/VstEffect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp index ef5a5946318..4e5aa1a5cb4 100644 --- a/plugins/VstEffect/VstEffectControls.cpp +++ b/plugins/VstEffect/VstEffectControls.cpp @@ -141,8 +141,7 @@ void VstEffectControls::saveSettings( QDomDocument & _doc, QDomElement & _this ) int VstEffectControls::controlCount() { - return m_effect->m_plugin != NULL && - m_effect->m_plugin->hasEditor() ? 1 : 0; + return m_effect->m_plugin != NULL ? 1 : 0; }