From 1c8d6484442c249d989d07999af360fb04047683 Mon Sep 17 00:00:00 2001 From: Tom Poole Date: Mon, 26 Nov 2018 14:37:09 +0000 Subject: [PATCH] Fixed a bug in the JUCE_FORCE_USE_LEGACY_PARAM_IDS compatibility flag --- .../format_types/juce_LegacyAudioParameter.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp b/modules/juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp index b744f569e8..65500f29f0 100644 --- a/modules/juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp +++ b/modules/juce_audio_processors/format_types/juce_LegacyAudioParameter.cpp @@ -111,7 +111,7 @@ public: { if (auto* legacy = dynamic_cast (param)) { - return legacy->getParamID(); + return forceLegacyParamIDs ? String (legacy->parameterIndex) : legacy->getParamID(); } else if (auto* paramWithID = dynamic_cast (param)) { @@ -134,7 +134,7 @@ public: legacyParamIDs = forceLegacyParamIDs; auto numParameters = audioProcessor.getNumParameters(); - usingManagedParameters = (audioProcessor.getParameters().size() == numParameters) && (! legacyParamIDs); + usingManagedParameters = audioProcessor.getParameters().size() == numParameters; for (int i = 0; i < numParameters; ++i) { @@ -160,7 +160,10 @@ public: String getParamID (AudioProcessor& processor, int idx) const noexcept { - return usingManagedParameters ? processor.getParameterID (idx) : String (idx); + if (usingManagedParameters && ! legacyParamIDs) + processor.getParameterID (idx); + + return String (idx); } bool isUsingManagedParameters() const noexcept { return usingManagedParameters; }