From 8b729d3ceb7cc480a0d0c86975e0a2bf72ff8972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lu=C3=ADs=20M=2E=20R=2E=20Guimar=C3=A3es?=
 <100025288+luismrguimaraes@users.noreply.github.com>
Date: Wed, 11 Sep 2024 15:53:24 +0100
Subject: [PATCH] Update stereo tool (and many other procs)

* rename stereo field manipulator and improve UI
* update sst-effects
* update basic-blocks
---
 libs/sst/sst-basic-blocks                     |  2 +-
 libs/sst/sst-effects                          |  2 +-
 .../edit-screen/components/ProcessorPane.cpp  | 22 +++++++++++++++++++
 .../edit-screen/components/ProcessorPane.h    |  1 +
 src/dsp/processor/processor.h                 |  3 +--
 src/dsp/processor/processor_defs.h            |  9 ++++----
 6 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/libs/sst/sst-basic-blocks b/libs/sst/sst-basic-blocks
index b83055f9..8d266fb2 160000
--- a/libs/sst/sst-basic-blocks
+++ b/libs/sst/sst-basic-blocks
@@ -1 +1 @@
-Subproject commit b83055f9fb8aa737eb0c3f1f30a7073bb01645ea
+Subproject commit 8d266fb273255e8266ba1f7e9ca5a0ffb72a60d2
diff --git a/libs/sst/sst-effects b/libs/sst/sst-effects
index c39ac433..87b9954d 160000
--- a/libs/sst/sst-effects
+++ b/libs/sst/sst-effects
@@ -1 +1 @@
-Subproject commit c39ac433906f4cf3f94738dab68e9e46c1b02a21
+Subproject commit 87b9954dfc78ee2632b4cabd260988333e576558
diff --git a/src-ui/app/edit-screen/components/ProcessorPane.cpp b/src-ui/app/edit-screen/components/ProcessorPane.cpp
index 78b0b12b..6264b3ae 100644
--- a/src-ui/app/edit-screen/components/ProcessorPane.cpp
+++ b/src-ui/app/edit-screen/components/ProcessorPane.cpp
@@ -228,6 +228,10 @@ void ProcessorPane::rebuildControlsFromDescription()
         layoutControlsMicroGate();
         break;
 
+    case dsp::processor::proct_stereotool:
+        layoutControlsStereoTool();
+        break;
+
     case dsp::processor::proct_CytomicSVF:
         layoutControlsFastSVF();
         break;
@@ -899,6 +903,24 @@ void ProcessorPane::layoutControlsMicroGate()
     lo::knob<55>(*floatEditors[3], 105, 75);
 }
 
+void ProcessorPane::layoutControlsStereoTool()
+{
+    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
index 93fff60f..cd20c733 100644
--- a/src-ui/app/edit-screen/components/ProcessorPane.h
+++ b/src-ui/app/edit-screen/components/ProcessorPane.h
@@ -83,6 +83,7 @@ struct ProcessorPane : sst::jucegui::components::NamedPanel, HasEditor, juce::Dr
 
     void layoutControls();
     void layoutControlsMicroGate();
+    void layoutControlsStereoTool();
     void layoutControlsSurgeFilters();
     void layoutControlsFastSVF();
     void layoutControlsWaveshaper();
diff --git a/src/dsp/processor/processor.h b/src/dsp/processor/processor.h
index 5d27ee65..43c0b401 100644
--- a/src/dsp/processor/processor.h
+++ b/src/dsp/processor/processor.h
@@ -116,7 +116,7 @@ enum ProcessorType
     proct_shepard,
     proct_Chorus,
     proct_volpan,
-    proct_stereofieldmanip,
+    proct_stereotool,
     proct_Compressor,
     proct_autowah,
 
@@ -134,7 +134,6 @@ enum ProcessorType
     proct_fx_distortion1,
     proct_fx_clipper,
     proct_fx_slewer,
-    proct_fx_stereotools,
     proct_fx_limiter,
     proct_fx_gate,
     proct_fx_microgate,
diff --git a/src/dsp/processor/processor_defs.h b/src/dsp/processor/processor_defs.h
index cb85e91f..a29f3500 100644
--- a/src/dsp/processor/processor_defs.h
+++ b/src/dsp/processor/processor_defs.h
@@ -94,7 +94,7 @@
 #include "sst/voice-effects/modulation/NoiseAM.h"
 #include "sst/voice-effects/delay/Chorus.h"
 #include "sst/voice-effects/utilities/VolumeAndPan.h"
-#include "sst/voice-effects/utilities/StereoFieldManipulator.h"
+#include "sst/voice-effects/utilities/StereoTool.h"
 #include "sst/voice-effects/dynamics/Compressor.h"
 #include "sst/voice-effects/dynamics/AutoWah.h"
 
@@ -156,10 +156,9 @@ DEFINE_PROC(TiltEQ, sst::voice_effects::eq::TiltEQ<SCXTVFXConfig<1>>,
 DEFINE_PROC(VolPan, sst::voice_effects::utilities::VolumeAndPan<SCXTVFXConfig<1>>,
             sst::voice_effects::utilities::VolumeAndPan<SCXTVFXConfig<2>>, proct_volpan,
             "Volume & Pan", "Utility", "volume-pan");
-DEFINE_PROC(StereoFieldManipulator,
-            sst::voice_effects::utilities::StereoFieldManipulator<SCXTVFXConfig<1>>,
-            sst::voice_effects::utilities::StereoFieldManipulator<SCXTVFXConfig<2>>,
-            proct_stereofieldmanip, "Stereo Field Manipulator", "Utility", "stereo-field-manip");
+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(Widener, sst::voice_effects::delay::Widener<SCXTVFXConfig<1>>,
             sst::voice_effects::delay::Widener<SCXTVFXConfig<2>>, proct_fx_widener, "Widener",
             "Utility", "fxstereo-fx", dsp::surgeSincTable);