From 95b4198e2ca1cba037cb46bdfda8f10ed334b565 Mon Sep 17 00:00:00 2001 From: jules Date: Sat, 28 Mar 2015 09:50:20 +0000 Subject: [PATCH] Removed a couple of superfluous methods from AudioProcessor. --- .../VST/juce_VST_Wrapper.cpp | 5 ++--- .../VST3/juce_VST3_Wrapper.cpp | 11 ++++------ .../processors/juce_AudioProcessor.cpp | 22 ------------------- .../processors/juce_AudioProcessor.h | 6 ----- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp index e08e708683..fed35c9365 100644 --- a/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp @@ -851,10 +851,9 @@ public: { jassert (isPositiveAndBelow (index, filter->getNumParameters())); - float value; - if (filter->valueFromString (index, text, value)) + if (AudioProcessorParameter* p = filter->getParameters()[index]) { - filter->setParameter (index, value); + filter->setParameter (index, p->getValueForText (String::fromUTF8 (text))); return true; } } diff --git a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp index 356b2bc460..86d4c44524 100644 --- a/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp +++ b/modules/juce_audio_plugin_client/VST3/juce_VST3_Wrapper.cpp @@ -197,10 +197,8 @@ public: void toString (Vst::ParamValue value, Vst::String128 result) const override { - String text; - - if (owner.stringFromValue (paramIndex, value, 128, text)) - toString128 (result, text); + if (AudioProcessorParameter* p = owner.getParameters()[paramIndex]) + toString128 (result, p->getText (value, 128)); else // remain backward-compatible with old JUCE code toString128 (result, owner.getParameterText (paramIndex, 128)); @@ -208,10 +206,9 @@ public: bool fromString (const Vst::TChar* text, Vst::ParamValue& valueNormalized) const override { - float value; - if (owner.valueFromString (paramIndex, getStringFromVstTChars (text), value)) + if (AudioProcessorParameter* p = owner.getParameters()[paramIndex]) { - valueNormalized = value; + valueNormalized = p->getValueForText (getStringFromVstTChars (text)); return true; } diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp index 38912da035..0dda683caa 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.cpp @@ -397,28 +397,6 @@ XmlElement* AudioProcessor::getXmlFromBinary (const void* data, const int sizeIn return nullptr; } -bool AudioProcessor::valueFromString (int index, const String& text, float& value) const -{ - if (AudioProcessorParameter* p = managedParameters[index]) - { - value = p->getValueForText (text); - return true; - } - - return false; -} - -bool AudioProcessor::stringFromValue (int index, float value, int maxLen, String& result) const -{ - if (AudioProcessorParameter* p = managedParameters[index]) - { - result = p->getText (value, maxLen); - return true; - } - - return false; -} - //============================================================================== void AudioProcessorListener::audioProcessorParameterChangeGestureBegin (AudioProcessor*, int) {} void AudioProcessorListener::audioProcessorParameterChangeGestureEnd (AudioProcessor*, int) {} diff --git a/modules/juce_audio_processors/processors/juce_AudioProcessor.h b/modules/juce_audio_processors/processors/juce_AudioProcessor.h index 98153a2af1..ae6ff71a9d 100644 --- a/modules/juce_audio_processors/processors/juce_AudioProcessor.h +++ b/modules/juce_audio_processors/processors/juce_AudioProcessor.h @@ -663,12 +663,6 @@ public: /** @internal */ static void JUCE_CALLTYPE setTypeOfNextNewPlugin (WrapperType); - /** @internal */ - bool valueFromString (int parameterIndex, const String& text, float& value) const; - - /** @internal */ - bool stringFromValue (int index, float value, int maxLen, String& result) const; - protected: /** @internal */ AudioPlayHead* playHead;