(XT 1.1) Add options for scene highpass slopes up to 48 dB/oct

src/common/Parameter.cpp

@@ -361,6 +361,7 @@ bool Parameter::has_deformoptions() const
 {
     switch (ctrltype)
     {
+    case ct_freq_hpf:
     case ct_lfodeform:
     case ct_modern_trimix:
     case ct_alias_mask:

src/common/SurgeStorage.h

@@ -167,6 +167,7 @@ enum deform_type
     type_1,
     type_2,
     type_3,
+    type_4,
 
     n_deform_types,
 };

src/common/SurgeSynthesizer.cpp

@@ -41,8 +41,11 @@ using namespace std;
 using CMSKey = ControllerModulationSourceVector<1>; // sigh see #4286 for failed first try
 
 SurgeSynthesizer::SurgeSynthesizer(PluginLayer *parent, const std::string &suppliedDataPath)
-    : storage(suppliedDataPath), hpA(&storage), hpB(&storage), _parent(parent), halfbandA(6, true),
-      halfbandB(6, true), halfbandIN(6, true)
+    : storage(suppliedDataPath), hpA{&storage, &storage, &storage, &storage}, hpB{&storage,
+                                                                                  &storage,
+                                                                                  &storage,
+                                                                                  &storage},
+      _parent(parent), halfbandA(6, true), halfbandB(6, true), halfbandIN(6, true)
 {
     switch_toggled_queued = false;
     audio_processing_active = false;
@@ -2048,8 +2051,11 @@ void SurgeSynthesizer::allNotesOff()
     halfbandB.reset();
     halfbandIN.reset();
 
-    hpA.suspend();
-    hpB.suspend();
+    for (int i = 0; i < n_hpBQ; i++)
+    {
+        hpA[i].suspend();
+        hpB[i].suspend();
+    }
 
     for (int i = 0; i < n_fx_slots; i++)
     {
@@ -3962,17 +3968,27 @@ void SurgeSynthesizer::process()
         auto freq =
             storage.getPatch().scenedata[0][storage.getPatch().scene[0].lowcut.param_id_in_scene].f;
 
-        hpA.coeff_HP(hpA.calc_omega(freq / 12.0), 0.4);    // var 0.707
-        hpA.process_block(sceneout[0][0], sceneout[0][1]); // TODO: quadify
+        auto slope = storage.getPatch().scene[0].lowcut.deform_type;
+
+        for (int i = 0; i <= slope; i++)
+        {
+            hpA[i].coeff_HP(hpA[i].calc_omega(freq / 12.0), 0.4); // var 0.707
+            hpA[i].process_block(sceneout[0][0], sceneout[0][1]); // TODO: quadify
+        }
     }
 
     if (storage.getPatch().scene[1].lowcut.deactivated == false)
     {
         auto freq =
             storage.getPatch().scenedata[1][storage.getPatch().scene[1].lowcut.param_id_in_scene].f;
 
-        hpB.coeff_HP(hpB.calc_omega(freq / 12.0), 0.4);
-        hpB.process_block(sceneout[1][0], sceneout[1][1]);
+        auto slope = storage.getPatch().scene[1].lowcut.deform_type;
+
+        for (int i = 0; i <= slope; i++)
+        {
+            hpB[i].coeff_HP(hpB[i].calc_omega(freq / 12.0), 0.4); // var 0.707
+            hpB[i].process_block(sceneout[1][0], sceneout[1][1]); // TODO: quadify
+        }
     }
 
     for (int cls = 0; cls < n_scenes; ++cls)

src/common/SurgeSynthesizer.h

@@ -381,7 +381,10 @@ class alignas(16) SurgeSynthesizer
 
     bool switch_toggled_queued, release_if_latched[n_scenes], release_anyway[n_scenes];
     void setParameterSmoothed(long index, float value);
-    BiquadFilter hpA, hpB; // TODO: FIX SCENE ASSUMPTION (use std::array)
+
+    static constexpr int n_hpBQ = 4;
+
+    std::array<BiquadFilter, n_hpBQ> hpA, hpB; // TODO: FIX SCENE ASSUMPTION (use std::array)
 
     bool fx_reload[n_fx_slots];   // if true, reload new effect parameters from fxsync
     FxStorage fxsync[n_fx_slots]; // used for synchronisation of parameter init

src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp

@@ -1643,7 +1643,24 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
                 {
                     switch (p->ctrltype)
                     {
+                    case ct_freq_hpf:
+                    {
+                        contextMenu.addSeparator();
+
+                        contextMenu.addSectionHeader("SLOPE");
 
+                        for (int i = 0; i < synth->n_hpBQ; i++)
+                        {
+                            std::string title = fmt::format("{:d} dB/oct", 12 * (i + 1));
+
+                            bool isChecked = p->deform_type == i;
+
+                            contextMenu.addItem(title, true, isChecked,
+                                                [this, p, i]() { p->deform_type = i; });
+                        }
+
+                        break;
+                    }
                     case ct_lfodeform:
                     {
                         auto q = modsource_editor[current_scene];
@@ -1658,8 +1675,7 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
 
                             for (int i = 0; i < lt_num_deforms[lfodata->shape.val.i]; i++)
                             {
-                                char title[32];
-                                sprintf(title, "Type %d", (i + 1));
+                                std::string title = fmt::format("Type {:d}", (i + 1));
 
                                 bool isChecked = p->deform_type == i;