bug fix to the reverb

semanticaudio · Jul 4, 2014 · c95e275 · c95e275
1 parent 876fa65
commit c95e275
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 18 deletions.
diff --git a/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessor.cpp b/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessor.cpp
@@ -137,7 +137,7 @@ const String SAFEAudioProcessor::getParameterName (int index)
 const String SAFEAudioProcessor::getParameterText (int index)
 {
     SAFEParameter* info = parameters [index];
-    return String (info->getScaledValue(), 2) + info->getUnits();
+    return String (info->getUIScaledValue(), 2) + info->getUnits();
 }
 
 const OwnedArray <SAFEParameter>& SAFEAudioProcessor::getParameterArray()
@@ -803,16 +803,16 @@ bool SAFEAudioProcessor::isReadyToSave()
 //==========================================================================
 //      Methods to Create New Parameters
 //==========================================================================
-void SAFEAudioProcessor::addParameter (String name, float& valueRef, float initialValue, float minValue, float maxValue, String units, float skewFactor, bool convertDBToGainValue, double interpolationTime)
+void SAFEAudioProcessor::addParameter (String name, float& valueRef, float initialValue, float minValue, float maxValue, String units, float skewFactor, bool convertDBToGainValue, double interpolationTime, float UIScaleFactor)
 {
-    parameters.add (new SAFEParameter (name, valueRef, initialValue, minValue, maxValue, units, skewFactor, convertDBToGainValue, interpolationTime));
+    parameters.add (new SAFEParameter (name, valueRef, initialValue, minValue, maxValue, units, skewFactor, convertDBToGainValue, interpolationTime, UIScaleFactor));
 
     parametersToSave.add (0);
 }
 
-void SAFEAudioProcessor::addDBParameter (String name, float& valueRef, float initialValue, float minValue, float maxValue, String units, float skewFactor, double interpolationTime)
+void SAFEAudioProcessor::addDBParameter (String name, float& valueRef, float initialValue, float minValue, float maxValue, String units, float skewFactor, double interpolationTime, float UIScaleFactor)
 {
-    parameters.add (new SAFEParameter (name, valueRef, initialValue, minValue, maxValue, units, skewFactor, true, interpolationTime));
+    parameters.add (new SAFEParameter (name, valueRef, initialValue, minValue, maxValue, units, skewFactor, true, interpolationTime, UIScaleFactor));
 
     parametersToSave.add (0);
 }

diff --git a/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessor.h b/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessor.h
@@ -132,9 +132,9 @@ class SAFEAudioProcessor : public AudioProcessor,
     //==========================================================================
     //      Methods to Create New Parameters
     //==========================================================================
-    void addParameter (String name, float& valueRef, float initialValue = 1, float minValue = 0, float maxValue = 1, String units = String::empty, float skewFactor = 1, bool convertDBToGainValue = false, double interpolationTime = 100);
+    void addParameter (String name, float& valueRef, float initialValue = 1, float minValue = 0, float maxValue = 1, String units = String::empty, float skewFactor = 1, bool convertDBToGainValue = false, double interpolationTime = 100, float UIScaleFactor = 1);
 
-    void addDBParameter (String name, float& valueRef, float initialValue = 1, float minValue = 0, float maxValue = 1, String units = String::empty, float skewFactor = 1, double interpolationTimeInit = 100);
+    void addDBParameter (String name, float& valueRef, float initialValue = 1, float minValue = 0, float maxValue = 1, String units = String::empty, float skewFactor = 1, double interpolationTimeInit = 100, float UIScaleFactor = 1);
 
     //==========================================================================
     //      Buffer Playing Audio For Analysis

diff --git a/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessorEditor.cpp b/JuceModules/SAFE_juce_module/PluginUtils/SAFEAudioProcessorEditor.cpp
@@ -47,11 +47,13 @@ SAFEAudioProcessorEditor::SAFEAudioProcessorEditor (SAFEAudioProcessor* ownerFil
         float currentDefaultValue = currentParameter->getDefaultValue();
         float currentSkewFactor = currentParameter->getSkewFactor();
         String currentUnits = currentParameter->getUnits();
+        float currentUIScaleFactor = currentParameter->getUIScaleFactor();
 
         currentSlider->setRange (currentMinValue, currentMaxValue, 0.01);
         currentSlider->setDefaultValue (currentDefaultValue);
         currentSlider->setSkewFactor (currentSkewFactor);
         currentSlider->setTextValueSuffix (currentUnits);
+        currentSlider->setTextBoxScaleFactor (currentUIScaleFactor);
         currentSlider->addListener (this);
     }
 

diff --git a/JuceModules/SAFE_juce_module/PluginUtils/SAFEParameter.cpp b/JuceModules/SAFE_juce_module/PluginUtils/SAFEParameter.cpp
@@ -1,7 +1,7 @@
 //==========================================================================
 //      Constructor and Destructor
 //==========================================================================
-SAFEParameter::SAFEParameter (String nameInit, float& valueRef, float initialValue, float minValueInit, float maxValueInit, String unitsInit, float skewFactorInit, bool convertDBToGainValue, double interpolationTimeInit)
+SAFEParameter::SAFEParameter (String nameInit, float& valueRef, float initialValue, float minValueInit, float maxValueInit, String unitsInit, float skewFactorInit, bool convertDBToGainValue, double interpolationTimeInit, float UIScaleFactorInit)
     : outputValue (valueRef),
       convertToGain (convertDBToGainValue)
 {
@@ -19,6 +19,8 @@ SAFEParameter::SAFEParameter (String nameInit, float& valueRef, float initialVal
     interpolationTime = interpolationTimeInit;
     updateBlockSizes();
 
+    UIScaleFactor = UIScaleFactorInit;
+
     setScaledValue (defaultValue);
 }
 
@@ -64,6 +66,11 @@ float SAFEParameter::getScaledValue() const
     return scaledValue;
 }
 
+float SAFEParameter::getUIScaledValue() const
+{
+    return scaledValue * UIScaleFactor;
+}
+
 float SAFEParameter::getGainValue() const
 {
     if (convertToGain)
@@ -102,6 +109,11 @@ const String SAFEParameter::getUnits() const
     return units;
 }
 
+float SAFEParameter::getUIScaleFactor() const
+{
+    return UIScaleFactor;
+}
+
 //==========================================================================
 //      Smoothing Bits
 //==========================================================================

diff --git a/JuceModules/SAFE_juce_module/PluginUtils/SAFEParameter.h b/JuceModules/SAFE_juce_module/PluginUtils/SAFEParameter.h
@@ -7,7 +7,7 @@ class SAFEParameter
     //==========================================================================
     //      Constructor and Destructor
     //==========================================================================
-    SAFEParameter (String nameInit, float& valueRef, float initialValue = 1, float minValueInit = 0, float maxValueInit = 1, String unitsInit = String::empty, float skewFactorInit = 1, bool convertDBToGainValue = false, double interpolationTimeInit = 100);
+    SAFEParameter (String nameInit, float& valueRef, float initialValue = 1, float minValueInit = 0, float maxValueInit = 1, String unitsInit = String::empty, float skewFactorInit = 1, bool convertDBToGainValue = false, double interpolationTimeInit = 100, float UIScaleFactorInit = 1);
     ~SAFEParameter();
 
     //==========================================================================
@@ -18,6 +18,7 @@ class SAFEParameter
 
     float getBaseValue() const;   
     float getScaledValue() const;
+    float getUIScaledValue() const;
     float getGainValue() const;
     float getDefaultValue() const;
 
@@ -28,6 +29,8 @@ class SAFEParameter
     const String getName() const;
     const String getUnits() const;
 
+    float getUIScaleFactor() const;
+
     //==========================================================================
     //      Smoothing Bits
     //==========================================================================
@@ -56,6 +59,8 @@ class SAFEParameter
 
     bool convertToGain;
 
+    double UIScaleFactor;
+
     void updateBlockSizes();
 
     void startInterpolating();

diff --git a/JuceModules/SAFE_juce_module/UIComponents/SAFESlider.cpp b/JuceModules/SAFE_juce_module/UIComponents/SAFESlider.cpp
@@ -63,6 +63,7 @@ SAFESlider::SAFESlider()
       textBoxWidth (50),
       textBoxHeight (15),
       numDecimalPlaces (1),
+      textBoxScaleFactor (1),
       useSIPrefixes (true)
 {
     setSize (80, 80);
@@ -126,11 +127,11 @@ void SAFESlider::setValue (double newValue, NotificationType notification)
 
     if (units != String::empty && useSIPrefixes)
     {
-        valueString = makeSIValueString (newValue) + units;
+        valueString = makeSIValueString (newValue * textBoxScaleFactor) + units;
     }
     else
     {
-        valueString = String (newValue, numDecimalPlaces);
+        valueString = String (newValue * textBoxScaleFactor, numDecimalPlaces);
     }
 
     textBox.setText (valueString);
@@ -192,7 +193,7 @@ void SAFESlider::setText (String newText)
 //==========================================================================
 void SAFESlider::sliderValueChanged (Slider* /*movedSlider*/)
 {
-    double sliderValue = slider.getValue();
+    double sliderValue = slider.getValue() * textBoxScaleFactor;
 
     String valueString;
 
@@ -236,13 +237,18 @@ void SAFESlider::resized()
 }
 
 //==========================================================================
-//      Number of Decimal Places for Text Box Value
+//      Text Box Settings
 //==========================================================================
 void SAFESlider::setNumDecimalPlaces (int newNumDecimalPlaces)
 {
     numDecimalPlaces = newNumDecimalPlaces;
 }
 
+void SAFESlider::setTextBoxScaleFactor (double newScaleFactor)
+{
+    textBoxScaleFactor = newScaleFactor;
+}
+
 //==========================================================================
 //      Make the Value String Look Pretty
 //==========================================================================

diff --git a/JuceModules/SAFE_juce_module/UIComponents/SAFESlider.h b/JuceModules/SAFE_juce_module/UIComponents/SAFESlider.h
@@ -57,10 +57,11 @@ class SAFESlider : public Component,
     void resized();
 
     //==========================================================================
-    //      Number of Decimal Places for Text Box Value
+    //      Text Box Settings
     //==========================================================================
     void setUseSIPrefixes (bool newValue);
     void setNumDecimalPlaces (int newNumDecimalPlaces);
+    void setTextBoxScaleFactor (double newScaleFactor);
 
 private:
     Label label;
@@ -104,6 +105,8 @@ class SAFESlider : public Component,
     String units;
     int numDecimalPlaces;
 
+    double textBoxScaleFactor;
+
     bool useSIPrefixes;
 
     //==========================================================================

diff --git a/SAFEReverb/Source/PluginProcessor.cpp b/SAFEReverb/Source/PluginProcessor.cpp
@@ -27,8 +27,8 @@ SafereverbAudioProcessor::SafereverbAudioProcessor()
     addParameter ("PreDelay", predelay, 0);
     addParameter ("Size", size, 0.5);
     addParameter ("Gain", gain, 1.0);
-    addParameter ("Mix", mix, 15.0, 0.0, 100.0, "%");
-    addParameter ("Early Mix", earlyMix, 75.0, 0.0, 100.0, "%");
+    addParameter ("Mix", mix, 0.15, 0.0, 1.0, "%", 1.0, false, 100.0, 100.0);
+    addParameter ("Early Mix", earlyMix, 0.75, 0.0, 1.0, "%", 1.0, false, 100.0, 100.0);
 
     for (int i = 0; i < 9; ++i)
     {
@@ -73,11 +73,11 @@ void SafereverbAudioProcessor::parameterUpdateCalculations (int index)
             break;
 
         case MVerb<float>::MIX:
-            reverb.setParameter (index, mix / 100.0);
+            reverb.setParameter (index, mix);
             break;
 
         case MVerb<float>::EARLYMIX:
-            reverb.setParameter (index, earlyMix / 100.0);
+            reverb.setParameter (index, earlyMix);
             break;
     }
 }