Templated Constructor Added To BaseProcessor For Handling Input and O…

…utput Port Types
Chowdhury-DSP · Jun 22, 2023 · 60e10a1 · 60e10a1
1 parent 86213d4
commit 60e10a1
Show file tree

Hide file tree

Showing 21 changed files with 103 additions and 54 deletions.
diff --git a/src/gui/pedalboard/editors/Port.cpp b/src/gui/pedalboard/editors/Port.cpp
@@ -1,4 +1,5 @@
 #include "Port.h"
+#include "../src/processors/BaseProcessor.h"
 #include "../cables/CableDrawingHelpers.h"
 
 Port::Port (const Colour& processorColour, const PortType type) : Component ("Port"),

diff --git a/src/gui/pedalboard/editors/Port.h b/src/gui/pedalboard/editors/Port.h
@@ -2,11 +2,7 @@
 
 #include <pch.h>
 
-enum class PortType
-{
-    audio = 0,
-    modulation,
-};
+enum class PortType;
 
 class Port : public Component
 {
@@ -25,7 +21,7 @@ class Port : public Component
     bool isConnected = false;
 
     const Colour& procColour;
-    const PortType portType = PortType::audio;
+    const PortType portType;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (Port)
 };
diff --git a/src/processors/BaseProcessor.cpp b/src/processors/BaseProcessor.cpp
@@ -4,12 +4,13 @@
 
 BaseProcessor::BaseProcessor (const String& name,
                               ParamLayout params,
-                              UndoManager* um,
-                              int nInputs,
-                              int nOutputs) : JuceProcWrapper (name),
-                                              vts (*this, um, Identifier ("Parameters"), std::move (params)),
-                                              numInputs (nInputs),
-                                              numOutputs (nOutputs)
+                              UndoManager* um) : BaseProcessor (name,
+                                                             params,
+                                                             BasicInputPort{},
+                                                             BasicOutputPort{},
+                                                             um,
+                                                             [] (auto) { return PortType::audio; },
+                                                             [] (auto) { return PortType::audio; })
 {
     onOffParam = vts.getRawParameterValue ("on_off");
 

diff --git a/src/processors/BaseProcessor.h b/src/processors/BaseProcessor.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "JuceProcWrapper.h"
+#include "netlist_helpers/CircuitQuantity.h"
 
 enum ProcessorType
 {
@@ -11,6 +12,12 @@ enum ProcessorType
     Other,
 };
 
+enum class PortType
+{
+    audio = 0,
+    modulation
+};
+
 struct ProcessorUIOptions
 {
     Colour backgroundColour = Colours::red;
@@ -40,16 +47,70 @@ struct ConnectionInfo
     int endPort;
 };
 
+namespace base_processor_detail
+{
+using PortTypesVector = chowdsp::SmallVector<PortType, 4>;
+
+template <typename Port, typename PortMapper>
+static PortTypesVector initialisePortTypes (PortMapper mapper)
+{
+    auto portTypes = PortTypesVector (magic_enum::enum_count<Port>(), PortType::audio);
+    magic_enum::enum_for_each<Port> ([&portTypes, &mapper] (auto portType)
+                                     {
+                                         const auto portIndex = *magic_enum::enum_index ((Port) portType);
+                                         portTypes[portIndex] = mapper ((Port) portType); });
+    return portTypes;
+}
+}
+
 class BaseProcessor : private JuceProcWrapper
 {
 public:
     using Ptr = std::unique_ptr<BaseProcessor>;
 
+    template <typename Port>
+    static constexpr auto defaultPortMapper (Port) { return PortType::audio; }
+
+    template <typename InputPort,
+              typename OutputPort,
+              typename InputPortMapper = decltype (&defaultPortMapper<InputPort>),
+              typename OutputPortMapper = decltype (&defaultPortMapper<OutputPort>)>
     BaseProcessor (const String& name,
-                   ParamLayout params,
+                   ParamLayout& params,
+                   InputPort,
+                   OutputPort,
                    UndoManager* um = nullptr,
-                   int nInputs = 1,
-                   int nOutputs = 1);
+                   InputPortMapper inputPortMapper = &defaultPortMapper<InputPort>,
+                   OutputPortMapper outputPortMapper = &defaultPortMapper<OutputPort>) : JuceProcWrapper (name),
+                                                                                         vts (*this, um, Identifier ("Parameters"), std::move (params)),
+                                                                                         numInputs(magic_enum::enum_count<InputPort>()),
+                                                                                         numOutputs(magic_enum::enum_count<OutputPort>()),
+                                                                                         inputPortTypes (base_processor_detail::initialisePortTypes<InputPort> (inputPortMapper)),
+                                                                                         outputPortTypes (base_processor_detail::initialisePortTypes<OutputPort> (outputPortMapper))
+    {
+
+        std::cout << "Creating processor: " << name << std::endl;
+        std::cout << "With input ports: " << std::endl;
+        for (size_t i = 0; i < inputPortTypes.size(); ++i)
+            std::cout << "    " << magic_enum::enum_name ((InputPort) i) << " (" << magic_enum::enum_name (inputPortTypes[i]) << ")" << std::endl;
+        std::cout << "With output ports: " << std::endl;
+        for (size_t i = 0; i < outputPortTypes.size(); ++i)
+            std::cout << "    " << magic_enum::enum_name ((OutputPort) i) << " (" << magic_enum::enum_name (outputPortTypes[i]) << ")" << std::endl;
+
+        onOffParam = vts.getRawParameterValue ("on_off");
+
+        outputBuffers.resize (jmax (1, numOutputs));
+        outputBuffers.fill (nullptr);
+        outputConnections.resize (numOutputs);
+
+        inputBuffers.resize (numInputs);
+        inputsConnected.resize (0);
+        portMagnitudes.resize (numInputs);
+    }
+
+    BaseProcessor (const String& name,
+                   ParamLayout params,
+                   UndoManager* um = nullptr);
     ~BaseProcessor();
 
     // metadata
@@ -186,6 +247,16 @@ class BaseProcessor : private JuceProcWrapper
      */
     auto& getSharedConvolutionMessageQueue() { return convolutionMessageQueue.get(); }
 
+    enum class BasicInputPort
+    {
+        AudioInput,
+    };
+
+    enum class BasicOutputPort
+    {
+        AudioOutput,
+    };
+
 private:
     std::atomic<float>* onOffParam = nullptr;
 
@@ -221,6 +292,8 @@ class BaseProcessor : private JuceProcWrapper
 
     juce::Array<int> inputModulationPorts {};
     juce::Array<int> outputModulationPorts {};
+    base_processor_detail::PortTypesVector inputPortTypes;
+    base_processor_detail::PortTypesVector outputPortTypes;
 
     std::unordered_map<int, std::vector<String>> paramsToDisableWhenInputConnected {};
 

diff --git a/src/processors/modulation/Chorus.cpp b/src/processors/modulation/Chorus.cpp
@@ -17,9 +17,7 @@ const String delayTypeTag = "delay_type";
 
 Chorus::Chorus (UndoManager* um) : BaseProcessor ("Chorus",
                                                   createParameterLayout(),
-                                                  um,
-                                                  magic_enum::enum_count<InputPort>(),
-                                                  magic_enum::enum_count<OutputPort>())
+                                                  um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateParam, vts, "rate");

diff --git a/src/processors/modulation/Flanger.cpp b/src/processors/modulation/Flanger.cpp
@@ -13,9 +13,7 @@ const String delayTypeTag = "delay_type";
 
 Flanger::Flanger (UndoManager* um) : BaseProcessor ("Flanger",
                                                     createParameterLayout(),
-                                                    um,
-                                                    magic_enum::enum_count<InputPort>(),
-                                                    magic_enum::enum_count<OutputPort>())
+                                                    um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateParam, vts, "rate");

diff --git a/src/processors/modulation/Panner.cpp b/src/processors/modulation/Panner.cpp
@@ -17,9 +17,7 @@ const String stereoModeTag = "stereo_mode";
 
 Panner::Panner (UndoManager* um) : BaseProcessor ("Panner",
                                                   createParameterLayout(),
-                                                  um,
-                                                  magic_enum::enum_count<InputPort>(),
-                                                  magic_enum::enum_count<OutputPort>())
+                                                  um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (mainPan, vts, mainPanTag);

diff --git a/src/processors/modulation/Rotary.cpp b/src/processors/modulation/Rotary.cpp
@@ -9,9 +9,7 @@ const String stereoTag = "stereo";
 
 Rotary::Rotary (UndoManager* um) : BaseProcessor ("Rotary",
                                                   createParameterLayout(),
-                                                  um,
-                                                  magic_enum::enum_count<InputPort>(),
-                                                  magic_enum::enum_count<OutputPort>())
+                                                  um)
 {
     chowdsp::ParamUtils::loadParameterPointer (rateHzParam, vts, "rate");
     chowdsp::ParamUtils::loadParameterPointer (stereoParam, vts, stereoTag);

diff --git a/src/processors/modulation/Tremolo.cpp b/src/processors/modulation/Tremolo.cpp
@@ -27,9 +27,7 @@ const String v1WaveTag = "v1_wave";
 
 Tremolo::Tremolo (UndoManager* um) : BaseProcessor ("Tremolo",
                                                     createParameterLayout(),
-                                                    um,
-                                                    magic_enum::enum_count<InputPort>(),
-                                                    magic_enum::enum_count<OutputPort>())
+                                                    um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateParam, vts, "rate");

diff --git a/src/processors/modulation/phaser/Phaser4.cpp b/src/processors/modulation/phaser/Phaser4.cpp
@@ -14,9 +14,7 @@ const String stereoTag = "stereo";
 
 Phaser4::Phaser4 (UndoManager* um) : BaseProcessor ("Phaser4",
                                                     createParameterLayout(),
-                                                    um,
-                                                    magic_enum::enum_count<InputPort>(),
-                                                    magic_enum::enum_count<OutputPort>())
+                                                    um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateHzParam, vts, rateTag);

diff --git a/src/processors/modulation/phaser/Phaser8.cpp b/src/processors/modulation/phaser/Phaser8.cpp
@@ -12,9 +12,7 @@ const String modulationTag = "modulation";
 
 Phaser8::Phaser8 (UndoManager* um) : BaseProcessor ("Phaser8",
                                                     createParameterLayout(),
-                                                    um,
-                                                    magic_enum::enum_count<InputPort>(),
-                                                    magic_enum::enum_count<OutputPort>())
+                                                    um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateHzParam, vts, rateTag);

diff --git a/src/processors/modulation/scanner_vibrato/ScannerVibrato.cpp b/src/processors/modulation/scanner_vibrato/ScannerVibrato.cpp
@@ -25,9 +25,7 @@ float ramp_down (float x, int off)
 
 ScannerVibrato::ScannerVibrato (UndoManager* um) : BaseProcessor ("Scanner Vibrato",
                                                                   createParameterLayout(),
-                                                                  um,
-                                                                  magic_enum::enum_count<InputPort>(),
-                                                                  magic_enum::enum_count<OutputPort>())
+                                                                  um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (rateHzParam, vts, rateTag);

diff --git a/src/processors/modulation/uni_vibe/UniVibe.cpp b/src/processors/modulation/uni_vibe/UniVibe.cpp
@@ -13,9 +13,7 @@ const String mixTag = "mix";
 
 UniVibe::UniVibe (UndoManager* um) : BaseProcessor ("Solo-Vibe",
                                                     createParameterLayout(),
-                                                    um,
-                                                    magic_enum::enum_count<InputPort>(),
-                                                    magic_enum::enum_count<OutputPort>())
+                                                    um)
 {
     using namespace ParameterHelpers;
     speedParamSmooth.setParameterHandle (getParameterPointer<chowdsp::FloatParameter*> (vts, speedTag));

diff --git a/src/processors/utility/FreqBandSplitter.cpp b/src/processors/utility/FreqBandSplitter.cpp
@@ -1,7 +1,7 @@
 #include "FreqBandSplitter.h"
 #include "../ParameterHelpers.h"
 
-FreqBandSplitter::FreqBandSplitter (UndoManager* um) : BaseProcessor ("Frequency Splitter", createParameterLayout(), um, 1, numOuts)
+FreqBandSplitter::FreqBandSplitter (UndoManager* um) : BaseProcessor ("Frequency Splitter", createParameterLayout(), um)
 {
     using namespace ParameterHelpers;
     loadParameterPointer (crossLowParam, vts, "cross_low");

diff --git a/src/processors/utility/InputProcessor.cpp b/src/processors/utility/InputProcessor.cpp
@@ -1,7 +1,7 @@
 #include "InputProcessor.h"
 #include "../ParameterHelpers.h"
 
-InputProcessor::InputProcessor (UndoManager* um) : BaseProcessor ("Input", createParameterLayout(), um, 0, 1)
+InputProcessor::InputProcessor (UndoManager* um) : BaseProcessor ("Input", createParameterLayout(), um)
 {
     uiOptions.backgroundColour = Colours::orange;
 }

diff --git a/src/processors/utility/Mixer.cpp b/src/processors/utility/Mixer.cpp
@@ -3,9 +3,7 @@
 
 Mixer::Mixer (UndoManager* um) : BaseProcessor ("Mixer",
                                                 createParameterLayout(),
-                                                um,
-                                                numIns,
-                                                1)
+                                                um)
 {
     for (int i = 0; i < numIns; ++i)
         chowdsp::ParamUtils::loadParameterPointer (gainDBParams[i], vts, "gain" + String (i));

diff --git a/src/processors/utility/Oscilloscope.cpp b/src/processors/utility/Oscilloscope.cpp
@@ -6,7 +6,7 @@ namespace
 constexpr int scopeFps = 30;
 }
 
-Oscilloscope::Oscilloscope (UndoManager* um) : BaseProcessor ("Oscilloscope", createParameterLayout(), um, 1, 0)
+Oscilloscope::Oscilloscope (UndoManager* um) : BaseProcessor ("Oscilloscope", createParameterLayout(), um)
 {
     uiOptions.backgroundColour = Colours::silver.brighter (0.2f);
     uiOptions.powerColour = Colours::red;

diff --git a/src/processors/utility/OutputProcessor.cpp b/src/processors/utility/OutputProcessor.cpp
@@ -1,7 +1,7 @@
 #include "OutputProcessor.h"
 #include "../ParameterHelpers.h"
 
-OutputProcessor::OutputProcessor (UndoManager* um) : BaseProcessor ("Output", createParameterLayout(), um, 1, 0)
+OutputProcessor::OutputProcessor (UndoManager* um) : BaseProcessor ("Output", createParameterLayout(), um)
 {
     uiOptions.backgroundColour = Colours::lightskyblue;
 }

diff --git a/src/processors/utility/StereoMerger.cpp b/src/processors/utility/StereoMerger.cpp
@@ -3,9 +3,7 @@
 
 StereoMerger::StereoMerger (UndoManager* um) : BaseProcessor ("Stereo Merger",
                                                               createParameterLayout(),
-                                                              um,
-                                                              magic_enum::enum_count<InputPort>(),
-                                                              1)
+                                                              um)
 {
     modeParam = vts.getRawParameterValue ("mode");
 

diff --git a/src/processors/utility/StereoSplitter.cpp b/src/processors/utility/StereoSplitter.cpp
@@ -1,7 +1,7 @@
 #include "StereoSplitter.h"
 #include "../ParameterHelpers.h"
 
-StereoSplitter::StereoSplitter (UndoManager* um) : BaseProcessor ("Stereo Splitter", createParameterLayout(), um, 1, numOuts)
+StereoSplitter::StereoSplitter (UndoManager* um) : BaseProcessor ("Stereo Splitter", createParameterLayout(), um)
 {
     modeParam = vts.getRawParameterValue ("mode");
 

diff --git a/src/processors/utility/Tuner.cpp b/src/processors/utility/Tuner.cpp
@@ -6,7 +6,7 @@ namespace
 constexpr int tunerRefreshHz = 24;
 }
 
-Tuner::Tuner (UndoManager* um) : BaseProcessor ("Tuner", createParameterLayout(), um, 1, 0)
+Tuner::Tuner (UndoManager* um) : BaseProcessor ("Tuner", createParameterLayout(), um)
 {
     uiOptions.backgroundColour = Colours::silver.brighter (0.2f);
     uiOptions.powerColour = Colours::red;