From f245d7454b9e0c07959f804e046d80d489666db7 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Fri, 27 Jul 2018 18:03:51 +0200 Subject: [PATCH] MSVC: Enable VstEffect --- plugins/CMakeLists.txt | 2 +- plugins/VstEffect/CMakeLists.txt | 1 - plugins/VstEffect/VstEffectControls.cpp | 16 +++++++--------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 0f7e59443c2..01e313c1744 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -96,7 +96,7 @@ IF(MSVC) ReverbSC sid vibed - VstEffect + #VstEffect Xpressive zynaddsubfx ) diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt index 78d8e64835a..68ef141d984 100644 --- a/plugins/VstEffect/CMakeLists.txt +++ b/plugins/VstEffect/CMakeLists.txt @@ -11,7 +11,6 @@ ELSE() ENDIF() BUILD_PLUGIN(vsteffect VstEffect.cpp VstEffectControls.cpp VstEffectControlDialog.cpp VstSubPluginFeatures.cpp VstEffect.h VstEffectControls.h VstEffectControlDialog.h VstSubPluginFeatures.h MOCFILES VstEffectControlDialog.h VstEffectControls.h EMBEDDED_RESOURCES *.png) -SET_TARGET_PROPERTIES(vsteffect PROPERTIES COMPILE_FLAGS "-Wno-attributes") TARGET_LINK_LIBRARIES(vsteffect vstbase) ENDIF(LMMS_SUPPORT_VST) diff --git a/plugins/VstEffect/VstEffectControls.cpp b/plugins/VstEffect/VstEffectControls.cpp index 173a769137a..07c7063c691 100644 --- a/plugins/VstEffect/VstEffectControls.cpp +++ b/plugins/VstEffect/VstEffectControls.cpp @@ -209,18 +209,16 @@ void VstEffectControls::updateMenu( void ) QMenu * to_menu = m_selPresetButton->menu(); to_menu->clear(); - QAction *presetActions[list1.size()]; - for (int i = 0; i < list1.size(); i++) { - presetActions[i] = new QAction(this); - connect(presetActions[i], SIGNAL(triggered()), this, SLOT(selPreset())); + QAction* presetAction = new QAction(this); + connect(presetAction, SIGNAL(triggered()), this, SLOT(selPreset())); - presetActions[i]->setText(QString("%1. %2").arg(QString::number(i+1), list1.at(i))); - presetActions[i]->setData(i); + presetAction->setText(QString("%1. %2").arg(QString::number(i+1), list1.at(i))); + presetAction->setData(i); if (i == lastPosInMenu) { - presetActions[i]->setIcon(embed::getIconPixmap( "sample_file", 16, 16 )); - } else presetActions[i]->setIcon(embed::getIconPixmap( "edit_copy", 16, 16 )); - to_menu->addAction( presetActions[i] ); + presetAction->setIcon(embed::getIconPixmap( "sample_file", 16, 16 )); + } else presetAction->setIcon(embed::getIconPixmap( "edit_copy", 16, 16 )); + to_menu->addAction( presetAction ); } }