dynamically allocate Spectrum Analysers for bandsplitter

Chowdhury-DSP · Dec 24, 2023 · 3a33647 · 3a33647
1 parent 3622ea1
commit 3a33647
Show file tree

Hide file tree

Showing 12 changed files with 229 additions and 40 deletions.
diff --git a/src/dsp/BandSplitter/BandSplitterProcessor.cpp b/src/dsp/BandSplitter/BandSplitterProcessor.cpp
@@ -12,8 +12,12 @@ void BandSplitterProcessor::prepare (const juce::dsp::ProcessSpec& spec)
                          [spec] (auto&& filter)
                          { filter.prepare (spec); });
 
+    lowPreSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
+    lowPostSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
     midPreSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
     midPostSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
+    highPreSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
+    highPostSpectrumAnalyserTask.prepareToPlay (spec.sampleRate, (int) spec.maximumBlockSize, (int) spec.numChannels);
 }
 
 void BandSplitterProcessor::processBlock (const chowdsp::BufferView<const float>& bufferIn,
@@ -32,7 +36,11 @@ void BandSplitterProcessor::processBlock (const chowdsp::BufferView<const float>
         return;
 
     if (extraState.isEditorOpen.load() && extraState.showPreSpectrum.get())
+    {
+        lowPreSpectrumAnalyserTask.processBlockInput (bufferLow.toAudioBuffer());
         midPreSpectrumAnalyserTask.processBlockInput (bufferMid.toAudioBuffer());
+        highPreSpectrumAnalyserTask.processBlockInput (bufferHigh.toAudioBuffer());
+    }
 
     const auto processTwoBandFilter = [&] (auto& filter)
     {
@@ -66,12 +74,21 @@ void BandSplitterProcessor::processBlock (const chowdsp::BufferView<const float>
     {
         processCrossover (threeBandFilters, processThreeBandFilter);
         if (extraState.isEditorOpen.load() && extraState.showPostSpectrum.get())
+        {
+            lowPostSpectrumAnalyserTask.processBlockInput(bufferLow.toAudioBuffer());
             midPostSpectrumAnalyserTask.processBlockInput (bufferMid.toAudioBuffer());
+            highPostSpectrumAnalyserTask.processBlockInput (bufferHigh.toAudioBuffer());
+        }
     }
     else
     {
         bufferMid.clear();
         processCrossover (twoBandFilters, processTwoBandFilter);
+        if (extraState.isEditorOpen.load() && extraState.showPostSpectrum.get())
+        {
+            lowPostSpectrumAnalyserTask.processBlockInput (bufferLow.toAudioBuffer());
+            highPostSpectrumAnalyserTask.processBlockInput (bufferHigh.toAudioBuffer());
+        }
     }
 }
 } // namespace dsp::band_splitter
diff --git a/src/dsp/BandSplitter/BandSplitterProcessor.h b/src/dsp/BandSplitter/BandSplitterProcessor.h
@@ -70,8 +70,12 @@ class BandSplitterProcessor
 public:
     explicit BandSplitterProcessor (const Params& bandSplitParams, const ExtraState& extraState) : params (bandSplitParams), extraState (extraState)
     {
+        lowPreSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
+        lowPostSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
         midPreSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
         midPostSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
+        highPreSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
+        highPostSpectrumAnalyserTask.SpectrumAnalyserUITask.setDBRange (-60, 5);
     }
 
     void prepare (const juce::dsp::ProcessSpec& spec);
@@ -80,11 +84,29 @@ class BandSplitterProcessor
                        const chowdsp::BufferView<float>& bufferMid,
                        const chowdsp::BufferView<float>& bufferHigh);
 
-    std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> getSpectrumAnalyserTasks()
+
+    std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> getSpectrumAnalyserTasksLow()
+    {
+        return { std::ref (lowPreSpectrumAnalyserTask.SpectrumAnalyserUITask), std::ref (lowPostSpectrumAnalyserTask.SpectrumAnalyserUITask) };
+    }
+
+    std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> getSpectrumAnalyserTasksMid()
     {
         return { std::ref (midPreSpectrumAnalyserTask.SpectrumAnalyserUITask), std::ref (midPostSpectrumAnalyserTask.SpectrumAnalyserUITask) };
     }
 
+    std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> getSpectrumAnalyserTasksHigh()
+    {
+        return { std::ref (highPreSpectrumAnalyserTask.SpectrumAnalyserUITask), std::ref (highPostSpectrumAnalyserTask.SpectrumAnalyserUITask) };
+    }
+
+//    static std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> getSpectrumAnalyserTasks(gui::SpectrumAnalyserTask::Optional preTask,
+//                                                                                                                         gui::SpectrumAnalyserTask::Optional postTask)
+//    {
+//        return {preTask.has_value() ? std::ref (preTask).get() :std::nullopt,
+//                 postTask.has_value() ? std::ref (postTask).get() : std::nullopt };
+//    }
+
 private:
     const Params& params;
     const ExtraState& extraState;
@@ -107,8 +129,13 @@ class BandSplitterProcessor
         chowdsp::ThreeWayCrossoverFilter<float, 12> filter12;
     } threeBandFilters;
 
+
+    gui::SpectrumAnalyserTask lowPreSpectrumAnalyserTask;
+    gui::SpectrumAnalyserTask lowPostSpectrumAnalyserTask;
     gui::SpectrumAnalyserTask midPreSpectrumAnalyserTask;
     gui::SpectrumAnalyserTask midPostSpectrumAnalyserTask;
+    gui::SpectrumAnalyserTask highPreSpectrumAnalyserTask;
+    gui::SpectrumAnalyserTask highPostSpectrumAnalyserTask;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (BandSplitterProcessor)
 };

diff --git a/src/gui/BandSplitter/BandSplitterEditor.cpp b/src/gui/BandSplitter/BandSplitterEditor.cpp
@@ -27,8 +27,10 @@ BandSplitterEditor::BandSplitterEditor (State& pluginState,
                                         dsp::band_splitter::Params& params,
                                         dsp::band_splitter::ExtraState& bandSplitterExtraState,
                                         const chowdsp::HostContextProvider& hcp,
-                                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasks)
-    : bandSplitterPlot (pluginState, params, bandSplitterExtraState, hcp, spectrumAnalyserTasks),
+                                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksLow,
+                                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksMid,
+                                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksHigh)
+    : bandSplitterPlot (pluginState, params, bandSplitterExtraState, hcp, spectrumAnalyserTasksLow, spectrumAnalyserTasksMid, spectrumAnalyserTasksHigh),
       slopePicker (pluginState, *params.slope),
       extraState (bandSplitterExtraState),
       bandsButton (*params.threeBandOnOff, pluginState)

diff --git a/src/gui/BandSplitter/BandSplitterEditor.h b/src/gui/BandSplitter/BandSplitterEditor.h
@@ -14,7 +14,9 @@ class BandSplitterEditor : public juce::Component
                         dsp::band_splitter::Params& params,
                         dsp::band_splitter::ExtraState& bandSplitterExtraState,
                         const chowdsp::HostContextProvider& hcp,
-                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasks);
+                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksLow,
+                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksMid,
+                        std::pair<gui::SpectrumAnalyserTask::Optional, gui::SpectrumAnalyserTask::Optional> spectrumAnalyserTasksHigh);
 
     void paint (juce::Graphics& g) override;
     void resized() override;