SmartGuitarAmp

commit 5bad7b09f190f7aed94ac912a1a69b1c57e9ea47
parent 82570c764d5da9ebb0b2ded727cd8854540c4dce
Author: keith <[email protected]>
Date:   Wed, 14 Oct 2020 20:31:31 -0500

Fixed knob state save logic

Diffstat:
M
plugins/SmartAmp/Source/PluginEditor.cpp
 | 
10
+++++++++-
M
plugins/SmartAmp/Source/PluginProcessor.cpp
 | 
10
----------

2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/plugins/SmartAmp/Source/PluginEditor.cpp b/plugins/SmartAmp/Source/PluginEditor.cpp
@@ -119,7 +119,7 @@ WaveNetVaAudioProcessorEditor::WaveNetVaAudioProcessorEditor (WaveNetVaAudioProc
     ampLeadTrebleKnob.setLookAndFeel(&ampSilverKnobLAF);
     ampLeadTrebleKnob.addListener(this);
     ampLeadTrebleKnob.setRange(-8.0, 8.0);
-    ampLeadTrebleKnob.setValue(processor.ampCleanTrebleKnobState);
+    ampLeadTrebleKnob.setValue(processor.ampLeadTrebleKnobState);
     ampLeadTrebleKnob.setSliderStyle(juce::Slider::SliderStyle::RotaryVerticalDrag);
     ampLeadTrebleKnob.setTextBoxStyle(juce::Slider::TextEntryBoxPosition::NoTextBox, false, 50, 20);
     ampLeadTrebleKnob.setNumDecimalPlacesToDisplay(1);
@@ -284,10 +284,18 @@ void WaveNetVaAudioProcessorEditor::sliderValueChanged(Slider* slider)
     else if (slider == &ampCleanBassKnob || slider == &ampCleanMidKnob || slider == &ampCleanTrebleKnob) {
         if (processor.amp_lead == 1)
             processor.set_ampEQ(ampCleanBassKnob.getValue(), ampCleanMidKnob.getValue(), ampCleanTrebleKnob.getValue(), ampPresenceKnob.getValue());
+        // Set knob states for saving positions when closing/reopening GUI
+        processor.ampCleanBassKnobState = ampCleanBassKnob.getValue();
+        processor.ampCleanMidKnobState = ampCleanMidKnob.getValue();
+        processor.ampCleanTrebleKnobState = ampCleanTrebleKnob.getValue();
     }
     else if (slider == &ampLeadBassKnob || slider == &ampLeadMidKnob || slider == &ampLeadTrebleKnob) {
         if (processor.amp_lead == 0)
             processor.set_ampEQ(ampLeadBassKnob.getValue(), ampLeadMidKnob.getValue(), ampLeadTrebleKnob.getValue(), ampPresenceKnob.getValue());
+        // Set knob states for saving positions when closing/reopening GUI
+        processor.ampLeadBassKnobState = ampLeadBassKnob.getValue();
+        processor.ampLeadMidKnobState = ampLeadMidKnob.getValue();
+        processor.ampLeadTrebleKnobState = ampLeadTrebleKnob.getValue();
     }
     else if (slider == &ampPresenceKnob) {
         if (processor.amp_lead == 1)
diff --git a/plugins/SmartAmp/Source/PluginProcessor.cpp b/plugins/SmartAmp/Source/PluginProcessor.cpp
@@ -261,16 +261,6 @@ void WaveNetVaAudioProcessor::set_ampEQ(float bass_slider, float mid_slider, flo
 {
     eq4band.setParameters(bass_slider, mid_slider, treble_slider, presence_slider);
 
-    // Set knob states for saving positions when closing/reopening GUI
-    if ( amp_lead == 1 ) {
-        ampCleanBassKnobState = bass_slider;
-        ampCleanMidKnobState = mid_slider;
-        ampCleanTrebleKnobState = treble_slider;
-    } else {
-        ampLeadBassKnobState = bass_slider;
-        ampLeadMidKnobState = mid_slider;
-        ampLeadTrebleKnobState = treble_slider;
-    }
     ampPresenceKnobState = presence_slider;
 }