add gain matrix proc (#1315)

surge-synthesizer · Sep 12, 2024 · 08d2c58 · 08d2c58
1 parent a1f71d3
commit 08d2c58
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 1 deletion.
diff --git a/libs/sst/sst-effects b/libs/sst/sst-effects
diff --git a/src-ui/app/edit-screen/components/ProcessorPane.cpp b/src-ui/app/edit-screen/components/ProcessorPane.cpp
@@ -232,6 +232,10 @@ void ProcessorPane::rebuildControlsFromDescription()
         layoutControlsStereoTool();
         break;
 
+    case dsp::processor::proct_gainmatrix:
+        layoutControlsGainMatrix();
+        break;
+
     case dsp::processor::proct_CytomicSVF:
         layoutControlsFastSVF();
         break;
@@ -921,6 +925,24 @@ void ProcessorPane::layoutControlsStereoTool()
     lo::knob<55>(*floatEditors[3], 105, 75);
 }
 
+void ProcessorPane::layoutControlsGainMatrix()
+{
+    namespace lo = theme::layout;
+    namespace locon = lo::constants;
+
+    floatEditors[0] = createWidgetAttachedTo(floatAttachments[0], floatAttachments[0]->getLabel());
+    lo::knob<55>(*floatEditors[0], 25, 0);
+
+    floatEditors[1] = createWidgetAttachedTo(floatAttachments[1], floatAttachments[1]->getLabel());
+    lo::knob<55>(*floatEditors[1], 105, 0);
+
+    floatEditors[2] = createWidgetAttachedTo(floatAttachments[2], floatAttachments[2]->getLabel());
+    lo::knob<55>(*floatEditors[2], 25, 75);
+
+    floatEditors[3] = createWidgetAttachedTo(floatAttachments[3], floatAttachments[3]->getLabel());
+    lo::knob<55>(*floatEditors[3], 105, 75);
+}
+
 void ProcessorPane::layoutControlsVAOsc()
 {
     namespace lo = theme::layout;

diff --git a/src-ui/app/edit-screen/components/ProcessorPane.h b/src-ui/app/edit-screen/components/ProcessorPane.h
@@ -84,6 +84,7 @@ struct ProcessorPane : sst::jucegui::components::NamedPanel, HasEditor, juce::Dr
     void layoutControls();
     void layoutControlsMicroGate();
     void layoutControlsStereoTool();
+    void layoutControlsGainMatrix();
     void layoutControlsSurgeFilters();
     void layoutControlsFastSVF();
     void layoutControlsWaveshaper();

diff --git a/src/dsp/processor/processor.h b/src/dsp/processor/processor.h
@@ -117,6 +117,7 @@ enum ProcessorType
     proct_Chorus,
     proct_volpan,
     proct_stereotool,
+    proct_gainmatrix,
     proct_Compressor,
     proct_autowah,
 

diff --git a/src/dsp/processor/processor_defs.h b/src/dsp/processor/processor_defs.h
@@ -95,6 +95,7 @@
 #include "sst/voice-effects/delay/Chorus.h"
 #include "sst/voice-effects/utilities/VolumeAndPan.h"
 #include "sst/voice-effects/utilities/StereoTool.h"
+#include "sst/voice-effects/utilities/GainMatrix.h"
 #include "sst/voice-effects/dynamics/Compressor.h"
 #include "sst/voice-effects/dynamics/AutoWah.h"
 
@@ -159,6 +160,9 @@ DEFINE_PROC(VolPan, sst::voice_effects::utilities::VolumeAndPan<SCXTVFXConfig<1>
 DEFINE_PROC(StereoTool, sst::voice_effects::utilities::StereoTool<SCXTVFXConfig<1>>,
             sst::voice_effects::utilities::StereoTool<SCXTVFXConfig<2>>, proct_stereotool,
             "Stereo Tool", "Utility", "stereo-tool");
+DEFINE_PROC(GainMatrix, sst::voice_effects::utilities::GainMatrix<SCXTVFXConfig<1>>,
+            sst::voice_effects::utilities::GainMatrix<SCXTVFXConfig<2>>, proct_gainmatrix,
+            "Gain Matrix", "Utility", "gain-matrix");
 DEFINE_PROC(Widener, sst::voice_effects::delay::Widener<SCXTVFXConfig<1>>,
             sst::voice_effects::delay::Widener<SCXTVFXConfig<2>>, proct_fx_widener, "Widener",
             "Utility", "fxstereo-fx", dsp::surgeSincTable);
+98 −0		include/sst/voice-effects/utilities/GainMatrix.h
+5 −0		tests/create-voice-effect.cpp