Update Slowboat patches (surge-synthesizer#6003)

* Update Slowboat patches

Also fix current_scene being used for mod names in MODULATORS context menu section.
Moved FX slot shorthand name definition to SurgeStorage.h.

src/common/Parameter.cpp

@@ -43,7 +43,9 @@ Parameter::~Parameter() = default;
 void get_prefix(char *txt, ControlGroup ctrlgroup, int ctrlgroup_entry, int scene)
 {
 #define PREFIX_SIZE 16
+
     char prefix[PREFIX_SIZE];
+
     switch (ctrlgroup)
     {
     case cg_OSC:
@@ -55,7 +57,7 @@ void get_prefix(char *txt, ControlGroup ctrlgroup, int ctrlgroup_entry, int scen
     case cg_ENV:
         snprintf(prefix, PREFIX_SIZE, "env%i_", ctrlgroup_entry + 1);
         break;
-    /*case 6:
+    /*case cg_LFO:
             snprintf(prefix, PREFIX_SIZE, "ms%i_",ctrlgroup_entry+1);
             break;*/
     case cg_FX:
@@ -65,12 +67,15 @@ void get_prefix(char *txt, ControlGroup ctrlgroup, int ctrlgroup_entry, int scen
         prefix[0] = '\0';
         break;
     };
-    if (scene == 2)
-        snprintf(txt, TXT_SIZE, "b_%s", prefix);
-    else if (scene == 1)
-        snprintf(txt, TXT_SIZE, "a_%s", prefix);
+
+    if (scene > 0 && scene <= n_scenes)
+    {
+        snprintf(txt, TXT_SIZE, "%c_%s", 'a' + scene - 1, prefix);
+    }
     else
+    {
         snprintf(txt, TXT_SIZE, "%s", prefix);
+    }
 }
 
 void Parameter::create_fullname(const char *dn, char *fn, ControlGroup ctrlgroup,
@@ -101,67 +106,21 @@ void Parameter::create_fullname(const char *dn, char *fn, ControlGroup ctrlgroup
         }
         else
         {
-            if (a > 6)
-                snprintf(prefix, PREFIX_SIZE, "Scene LFO %i", a - 6);
+            if (a > n_lfos_voice)
+                snprintf(prefix, PREFIX_SIZE, "Scene LFO %i", a - n_lfos_voice);
             else
                 snprintf(prefix, PREFIX_SIZE, "LFO %i", a);
         }
     }
     break;
     case cg_FX:
-        switch (ctrlgroup_entry)
+        if (ctrlgroup_entry >= 0 && ctrlgroup_entry < n_fx_slots)
         {
-        case 0:
-            snprintf(prefix, PREFIX_SIZE, "FX A1");
-            break;
-        case 1:
-            snprintf(prefix, PREFIX_SIZE, "FX A2");
-            break;
-        case 2:
-            snprintf(prefix, PREFIX_SIZE, "FX B1");
-            break;
-        case 3:
-            snprintf(prefix, PREFIX_SIZE, "FX B2");
-            break;
-        case 4:
-            snprintf(prefix, PREFIX_SIZE, "FX S1");
-            break;
-        case 5:
-            snprintf(prefix, PREFIX_SIZE, "FX S2");
-            break;
-        case 6:
-            snprintf(prefix, PREFIX_SIZE, "FX M1");
-            break;
-        case 7:
-            snprintf(prefix, PREFIX_SIZE, "FX M2");
-            break;
-        case 8:
-            snprintf(prefix, PREFIX_SIZE, "FX A3");
-            break;
-        case 9:
-            snprintf(prefix, PREFIX_SIZE, "FX A4");
-            break;
-        case 10:
-            snprintf(prefix, PREFIX_SIZE, "FX B3");
-            break;
-        case 11:
-            snprintf(prefix, PREFIX_SIZE, "FX B4");
-            break;
-        case 12:
-            snprintf(prefix, PREFIX_SIZE, "FX S3");
-            break;
-        case 13:
-            snprintf(prefix, PREFIX_SIZE, "FX S4");
-            break;
-        case 14:
-            snprintf(prefix, PREFIX_SIZE, "FX M3");
-            break;
-        case 15:
-            snprintf(prefix, PREFIX_SIZE, "FX M4");
-            break;
-        default:
-            snprintf(prefix, PREFIX_SIZE, "FXERR");
-            break;
+            snprintf(prefix, PREFIX_SIZE, "%s", fxslot_shortnames[ctrlgroup_entry]);
+        }
+        else
+        {
+            snprintf(prefix, PREFIX_SIZE, "N/A");
         }
         break;
     default:

src/common/SurgeStorage.cpp

@@ -261,8 +261,6 @@ SurgeStorage::SurgeStorage(std::string suppliedDataPath) : otherscene_clients(0)
         {
             auto portable = cp / L"SurgeXTData";
 
-            std::cout << portable << endl;
-
             if (fs::is_directory(portable))
             {
                 datapath = std::move(portable);
@@ -293,8 +291,6 @@ SurgeStorage::SurgeStorage(std::string suppliedDataPath) : otherscene_clients(0)
     {
         auto portable = cp / L"SurgeXTUserData";
 
-        std::cout << portable << endl;
-
         if (fs::is_directory(portable))
         {
             userDataPath = std::move(portable);

src/common/SurgeStorage.h

@@ -279,6 +279,11 @@ const char fxslot_names[n_fx_slots][NAMECHARS] = {
     "Send FX 3",     "Send FX 4",     "Global FX 3",   "Global FX 4",
 };
 
+const char fxslot_shortnames[n_fx_slots][8] = {
+    "FX A1", "FX A2", "FX B1", "FX B2", "FX S1", "FX S2", "FX G1", "FX G2",
+    "FX A3", "FX A4", "FX B3", "FX B4", "FX S3", "FX S4", "FX G3", "FX G4",
+};
+
 enum fx_type
 {
     fxt_off = 0,

src/surge-xt/gui/SurgeGUIEditorValueCallbacks.cpp

@@ -2154,8 +2154,8 @@ int32_t SurgeGUIEditor::controlModifierClicked(Surge::GUI::IComponentTagValue *c
                                         modtxt, synth->getModDepth(ptag, ms, sc, modidx),
                                         synth->isBipolarModulation(ms), Parameter::Menu);
 
-                                    std::string srctxt = modulatorNameWithIndex(
-                                        current_scene, ms, modidx, true, showScene);
+                                    std::string srctxt =
+                                        modulatorNameWithIndex(sc, ms, modidx, true, showScene);
 
                                     auto comp =
                                         std::make_unique<Surge::Widgets::ModMenuCustomComponent>(