From e24cfc864ac3877260a93917865cd78e77deb4b7 Mon Sep 17 00:00:00 2001 From: ed Date: Wed, 28 Mar 2018 16:14:25 +0100 Subject: [PATCH] Projucer: Fixed a couple of VST/VST3 typos in the previous commit --- .../Projucer/Source/Project/jucer_Project.cpp | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/extras/Projucer/Source/Project/jucer_Project.cpp b/extras/Projucer/Source/Project/jucer_Project.cpp index 99e53eb9c6..8567555aac 100644 --- a/extras/Projucer/Source/Project/jucer_Project.cpp +++ b/extras/Projucer/Source/Project/jucer_Project.cpp @@ -235,7 +235,7 @@ void Project::initialiseAudioPluginValues() pluginAUMainTypeValue.referTo (projectRoot, Ids::pluginAUMainType, getUndoManager()); pluginVSTCategoryValue.referTo (projectRoot, Ids::pluginVSTCategory, getUndoManager(), getDefaultVSTCategories(), ","); - pluginVST3CategoryValue.referTo (projectRoot, Ids::pluginVST3Category, getUndoManager(), getDefaultVSTCategories(), ","); + pluginVST3CategoryValue.referTo (projectRoot, Ids::pluginVST3Category, getUndoManager(), getDefaultVST3Categories(), ","); pluginRTASCategoryValue.referTo (projectRoot, Ids::pluginRTASCategory, getUndoManager(), getDefaultRTASCategories(), ","); pluginAAXCategoryValue.referTo (projectRoot, Ids::pluginAAXCategory, getUndoManager(), getDefaultAAXCategories(), ","); } @@ -677,7 +677,7 @@ void Project::valueTreePropertyChanged (ValueTree& tree, const Identifier& prope else if (property == Ids::pluginCharacteristicsValue) { pluginVSTCategoryValue.setDefault (getDefaultVSTCategories()); - pluginVST3CategoryValue.setDefault (getDefaultVSTCategories()); + pluginVST3CategoryValue.setDefault (getDefaultVST3Categories()); pluginRTASCategoryValue.setDefault (getDefaultRTASCategories()); pluginAAXCategoryValue.setDefault (getDefaultAAXCategories()); @@ -1544,7 +1544,17 @@ bool Project::isConfigFlagEnabled (const String& name, bool defaultIsEnabled) co } //============================================================================== -static String getVSTCategoryStringFromSelection (Array selected) noexcept +String Project::getVSTCategoryString() const noexcept +{ + auto v = pluginVSTCategoryValue.get(); + + if (auto* arr = v.getArray()) + return arr->getFirst().toString(); + + return {}; +} + +static String getVST3CategoryStringFromSelection (Array selected) noexcept { StringArray categories; @@ -1554,22 +1564,12 @@ static String getVSTCategoryStringFromSelection (Array selected) noexcept return categories.joinIntoString ("|"); } -String Project::getVSTCategoryString() const noexcept -{ - auto v = pluginVSTCategoryValue.get(); - - if (auto* arr = v.getArray()) - return getVSTCategoryStringFromSelection (*arr); - - return {}; -} - String Project::getVST3CategoryString() const noexcept { auto v = pluginVST3CategoryValue.get(); if (auto* arr = v.getArray()) - return getVSTCategoryStringFromSelection (*arr); + return getVST3CategoryStringFromSelection (*arr); return {}; }