Little bits of cleanup

Chowdhury-DSP · Jan 3, 2024 · 1e035bd · 1e035bd
1 parent c0e0fa7
commit 1e035bd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/src/dsp/Brickwall/BrickwallProcessor.cpp b/src/dsp/Brickwall/BrickwallProcessor.cpp
@@ -22,7 +22,7 @@ void BrickwallProcessor::processBlock (const chowdsp::BufferView<float>& buffer)
     filter.setCutoffFrequency (*params.cutoff);
     filter.processBlock (buffer);
 
-    if (extraState.isEditorOpen.load() && extraState.showPostSpectrum.get())
+    if (extraState.isEditorOpen.load() && extraState.showSpectrum.get())
         postSpectrumAnalyserTask.processBlockInput (buffer.toAudioBuffer());
 }
 

diff --git a/src/dsp/Brickwall/BrickwallProcessor.h b/src/dsp/Brickwall/BrickwallProcessor.h
@@ -33,7 +33,7 @@ enum class FilterType
 struct ExtraState
 {
     std::atomic<bool> isEditorOpen { false };
-    chowdsp::StateValue<std::atomic_bool, bool> showPostSpectrum { "brickwall_show_post_spectrum", true };
+    chowdsp::StateValue<std::atomic_bool, bool> showSpectrum { "brickwall_show_spectrum", true };
 };
 
 } // namespace dsp::brickwall

diff --git a/src/gui/AnalogEQ/AnalogEQEditor.cpp b/src/gui/AnalogEQ/AnalogEQEditor.cpp
@@ -8,8 +8,7 @@ AnalogEQEditor::AnalogEQEditor (State& pluginState,
                                 dsp::analog_eq::ExtraState& analogEqExtraState,
                                 const chowdsp::HostContextProvider& hcp,
                                 SpectrumAnalyserTask::PrePostPair spectrumAnalyserTasks)
-    : plot (pluginState, params, analogEqExtraState, hcp, spectrumAnalyserTasks),
-      extraState (analogEqExtraState)
+    : plot (pluginState, params, analogEqExtraState, hcp, spectrumAnalyserTasks)
 {
     addAndMakeVisible (plot);
 }

diff --git a/src/gui/AnalogEQ/AnalogEQEditor.h b/src/gui/AnalogEQ/AnalogEQEditor.h
@@ -18,7 +18,6 @@ class AnalogEQEditor : public juce::Component
 
 private:
     AnalogEQPlot plot;
-    dsp::analog_eq::ExtraState& extraState;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (AnalogEQEditor)
 };

diff --git a/src/gui/BandSplitter/BandSplitterPlot.cpp b/src/gui/BandSplitter/BandSplitterPlot.cpp
@@ -281,7 +281,6 @@ void BandSplitterPlot::updateSpectrumPlots()
     for (auto id : spectrumIDs())
     {
         auto* spectrumTask = *spectrumTasks[id];
-        spectrumTask->reset();
         auto prePostPair = SpectrumAnalyserTask::PrePostPair { std::nullopt, std::ref (spectrumTask->spectrumAnalyserUITask) };
         spectrumAnalysers.insert_or_assign (id, std::make_unique<SpectrumAnalyser> (*this, prePostPair));
     }

diff --git a/src/gui/Brickwall/BrickwallPlot.cpp b/src/gui/Brickwall/BrickwallPlot.cpp
@@ -119,11 +119,11 @@ BrickwallPlot::BrickwallPlot (State& pluginState,
 {
     addMouseListener (this, true);
     extraState.isEditorOpen.store (true);
-    spectrumAnalyser.setShouldShowPostEQ (extraState.showPostSpectrum.get());
+    spectrumAnalyser.setShouldShowPostEQ (extraState.showSpectrum.get());
     callbacks += {
-        extraState.showPostSpectrum.changeBroadcaster.connect ([this]
+        extraState.showSpectrum.changeBroadcaster.connect ([this]
                                                                {
-                                                                   spectrumAnalyser.setShouldShowPostEQ(extraState.showPostSpectrum.get());
+                                                                   spectrumAnalyser.setShouldShowPostEQ(extraState.showSpectrum.get());
                                                                    spectrumAnalyser.repaint(); }),
     };
 
@@ -179,10 +179,10 @@ void BrickwallPlot::mouseDown (const juce::MouseEvent& event)
 
         juce::PopupMenu::Item postSpectrumItem;
         postSpectrumItem.itemID = 100;
-        postSpectrumItem.text = extraState.showPostSpectrum.get() ? "Disable Post-EQ Visualizer" : "Enable Post-EQ Visualizer";
+        postSpectrumItem.text = extraState.showSpectrum.get() ? "Disable Spectrum Visualizer" : "Enable Spectrum Visualizer";
         postSpectrumItem.action = [this]
         {
-            extraState.showPostSpectrum.set (! extraState.showPostSpectrum.get());
+            extraState.showSpectrum.set (! extraState.showSpectrum.get());
         };
         menu.addItem (postSpectrumItem);
 

diff --git a/src/gui/SVF/SVFPlot.cpp b/src/gui/SVF/SVFPlot.cpp
@@ -194,7 +194,7 @@ void SVFPlot::mouseDown (const juce::MouseEvent& event)
 
         juce::PopupMenu::Item preSpectrumItem;
         preSpectrumItem.itemID = 100;
-        preSpectrumItem.text = extraState.showPreSpectrum.get() ? "Disable Pre-EQ Visualizer" : "Enable Pre-EQ Visualizer";
+        preSpectrumItem.text = extraState.showPreSpectrum.get() ? "Disable Pre-Filter Visualizer" : "Enable Pre-Filter Visualizer";
         preSpectrumItem.action = [this]
         {
             extraState.showPreSpectrum.set (! extraState.showPreSpectrum.get());
@@ -203,7 +203,7 @@ void SVFPlot::mouseDown (const juce::MouseEvent& event)
 
         juce::PopupMenu::Item postSpectrumItem;
         postSpectrumItem.itemID = 101;
-        postSpectrumItem.text = extraState.showPostSpectrum.get() ? "Disable Post-EQ Visualizer" : "Enable Post-EQ Visualizer";
+        postSpectrumItem.text = extraState.showPostSpectrum.get() ? "Disable Post-Filter Visualizer" : "Enable Post-Filter Visualizer";
         postSpectrumItem.action = [this]
         {
             extraState.showPostSpectrum.set (! extraState.showPostSpectrum.get());

diff --git a/src/gui/Shared/SpectrumAnalyser.cpp b/src/gui/Shared/SpectrumAnalyser.cpp
@@ -56,9 +56,15 @@ void SpectrumAnalyser::visibilityChanged()
     if (isVisible())
     {
         if (preTask)
+        {
+            preTask->get().reset();
             preTask->get().setShouldBeRunning (showPreEQ);
+        }
         if (postTask)
+        {
+            postTask->get().reset();
             postTask->get().setShouldBeRunning (showPostEQ);
+        }
         startTimerHz (32);
     }
     else

diff --git a/src/state/PluginState.cpp b/src/state/PluginState.cpp
@@ -60,7 +60,7 @@ PluginExtraState::PluginExtraState()
                       &analogEqExtraState->showPostSpectrum,
                       &eqExtraState->showPreSpectrum,
                       &eqExtraState->showPostSpectrum,
-                      &brickwallExtraState->showPostSpectrum,
+                      &brickwallExtraState->showSpectrum,
                       &svfExtraState->showPreSpectrum,
                       &svfExtraState->showPostSpectrum,
                       &bandSplitterExtraState->showSpectrum,