Remove metaparam_offset

With the advent of JUCE we no longer map the macros
to DAW parameters with an integer offset but rather have
a distinct class which handles Macros. Therefore we can
remove all the metaparam_offset ranges in the code

Closes surge-synthesizer#4854

src/common/ModulationSource.h

@@ -118,7 +118,6 @@ const int modsource_display_order[n_modsources] = {
 };
 
 const int n_customcontrollers = 8;
-const int num_metaparameters = n_customcontrollers;
 extern float samplerate_inv;
 extern float samplerate;
 

src/common/SurgeStorage.h

@@ -107,7 +107,6 @@ const int n_scene_params = 271;
 const int n_global_params = 9 + n_fx_slots * (n_fx_params + 1); // each param plus a type
 const int n_global_postparams = 1;
 const int n_total_params = n_global_params + 2 * n_scene_params + n_global_postparams;
-const int metaparam_offset = 20480; // has to be bigger than total + 16 * 130 for fake VST3 mapping
 const int n_scenes = 2;
 const int n_filterunits_per_scene = 2;
 const int n_max_filter_subtypes = 16;
@@ -823,7 +822,7 @@ class SurgePatch
 
     // metadata
     std::string name, category, author, comment;
-    // metaparameters
+    // macro controllers
 #define CUSTOM_CONTROLLER_LABEL_SIZE 20
     char CustomControllerLabel[n_customcontrollers][CUSTOM_CONTROLLER_LABEL_SIZE];
 

src/common/SurgeSynthesizer.cpp

@@ -1928,18 +1928,9 @@ bool SurgeSynthesizer::setParameter01(long index, float value, bool external, bo
 {
     // does the parameter exist in the interpolator array? If it does, delete it
     ReleaseControlInterpolator(index);
-
     bool need_refresh = false;
 
-    if (index >= metaparam_offset)
-    {
-        ((ControllerModulationSource *)storage.getPatch().scene[0].modsources[ms_ctrl1 + index -
-                                                                              metaparam_offset])
-            ->set_target01(value, true);
-        return false;
-    }
-
-    if (index < storage.getPatch().param_ptr.size())
+    if (index >= 0 && index < storage.getPatch().param_ptr.size())
     {
         pdata oldval;
         oldval.i = storage.getPatch().param_ptr[index]->val.i;
@@ -1951,17 +1942,6 @@ bool SurgeSynthesizer::setParameter01(long index, float value, bool external, bo
             need_refresh = true;
         }
 
-        /*if(storage.getPatch().param_ptr[index]->ctrltype == ct_polymode)
-        {
-                if (storage.getPatch().param_ptr[index]->val.i == pm_latch)
-                {
-                        int s = storage.getPatch().param_ptr[index]->scene - 1;
-                        release_if_latched[s&1] = true;
-                        release_anyway[s&1] = true;
-                        // release old notes if previous polymode was latch
-                }
-        }*/
-
         switch (storage.getPatch().param_ptr[index]->ctrltype)
         {
         case ct_scenemode:
@@ -2915,14 +2895,7 @@ void SurgeSynthesizer::setMacroParameter01(long macroNum, float val)
 
 float SurgeSynthesizer::getParameter01(long index)
 {
-    if (index < 0)
-        return 0.f;
-    if (index >= metaparam_offset)
-        return storage.getPatch()
-            .scene[0]
-            .modsources[ms_ctrl1 + index - metaparam_offset]
-            ->get_output01(0);
-    if (index < storage.getPatch().param_ptr.size())
+    if (index >= 0 && index < storage.getPatch().param_ptr.size())
         return storage.getPatch().param_ptr[index]->get_value_f01();
     return 0.f;
 }
@@ -2933,16 +2906,7 @@ void SurgeSynthesizer::getParameterDisplay(long index, char *text)
     {
         storage.getPatch().param_ptr[index]->get_display(text);
     }
-    else if (index >= metaparam_offset)
-    {
-        snprintf(text, TXT_SIZE, "%.2f %%",
-                 100.f * storage.getPatch()
-                             .scene[0]
-                             .modsources[ms_ctrl1 + index - metaparam_offset]
-                             ->get_output(0));
-    }
-    else
-        snprintf(text, TXT_SIZE, "-");
+    snprintf(text, TXT_SIZE, "-");
 }
 
 void SurgeSynthesizer::getParameterDisplayAlt(long index, char *text)
@@ -2963,14 +2927,6 @@ void SurgeSynthesizer::getParameterDisplay(long index, char *text, float x)
     {
         storage.getPatch().param_ptr[index]->get_display(text, true, x);
     }
-    else if (index >= metaparam_offset)
-    {
-        snprintf(text, TXT_SIZE, "%.2f %%",
-                 100.f * storage.getPatch()
-                             .scene[0]
-                             .modsources[ms_ctrl1 + index - metaparam_offset]
-                             ->get_output(0));
-    }
     else
         snprintf(text, TXT_SIZE, "-");
 }
@@ -2986,12 +2942,6 @@ void SurgeSynthesizer::getParameterName(long index, char *text)
         snprintf(text, TXT_SIZE, "%s%s", sn[scn].c_str(),
                  storage.getPatch().param_ptr[index]->get_full_name());
     }
-    else if (index >= metaparam_offset)
-    {
-        int c = index - metaparam_offset;
-        snprintf(text, TXT_SIZE, "Macro %i: %s", c + 1,
-                 storage.getPatch().CustomControllerLabel[c]);
-    }
     else
         snprintf(text, TXT_SIZE, "-");
 }
@@ -3007,12 +2957,6 @@ void SurgeSynthesizer::getParameterAccessibleName(long index, char *text)
         snprintf(text, TXT_SIZE, "%s%s", sn[scn].c_str(),
                  storage.getPatch().param_ptr[index]->get_full_name());
     }
-    else if (index >= metaparam_offset)
-    {
-        int c = index - metaparam_offset;
-        snprintf(text, TXT_SIZE, "Macro %i: %s", c + 1,
-                 storage.getPatch().CustomControllerLabel[c]);
-    }
     else
         snprintf(text, TXT_SIZE, "-");
 }
@@ -3040,64 +2984,34 @@ void SurgeSynthesizer::getParameterMeta(long index, parametermeta &pm)
                 pm.clump++;
         }
     }
-    else if (index >= metaparam_offset)
-    {
-        pm.flags = 0;
-        pm.fmin = 0.f;
-        pm.fmax = 1.f;
-        pm.fdefault = 0.5f;
-        pm.hide = false;
-        pm.meta =
-            false; // ironic as they are metaparameters, but they don't affect any other sliders
-        pm.expert = false;
-        pm.clump = 1;
-    }
+
 }
 
 float SurgeSynthesizer::getParameter(long index)
 {
-    if (index < 0)
-        return 0.f;
-    if (index >= metaparam_offset)
-        return storage.getPatch()
-            .scene[0]
-            .modsources[ms_ctrl1 + index - metaparam_offset]
-            ->get_output(0);
-    if (index < storage.getPatch().param_ptr.size())
+    if (index >= 0 && index < storage.getPatch().param_ptr.size())
         return storage.getPatch().param_ptr[index]->get_value_f01();
     return 0.f;
 }
 
 float SurgeSynthesizer::normalizedToValue(long index, float value)
 {
-    if (index < 0)
-        return 0.f;
-    if (index >= metaparam_offset)
-        return value;
-    if (index < storage.getPatch().param_ptr.size())
+    if (index >= 0 && index < storage.getPatch().param_ptr.size())
         return storage.getPatch().param_ptr[index]->normalized_to_value(value);
     return 0.f;
 }
 
 float SurgeSynthesizer::valueToNormalized(long index, float value)
 {
-    if (index < 0)
-        return 0.f;
-    if (index >= metaparam_offset)
-        return value;
-    if (index < storage.getPatch().param_ptr.size())
+    if (index >= 0 && index < storage.getPatch().param_ptr.size())
         return storage.getPatch().param_ptr[index]->value_to_normalized(value);
     return 0.f;
 }
 
 bool SurgeSynthesizer::stringToNormalizedValue(const ID &index, std::string s, float &outval)
 {
     int id = index.getSynthSideId();
-    if (id < 0)
-        return false;
-    if (id >= metaparam_offset)
-        return false;
-    if (id >= storage.getPatch().param_ptr.size())
+    if (id < 0 || id >= storage.getPatch().param_ptr.size())
         return false;
 
     auto p = storage.getPatch().param_ptr[id];

src/gui/SurgeGUIEditor.cpp

@@ -513,15 +513,6 @@ void SurgeGUIEditor::idle()
                     lfoDisplay->invalidateIfIdIsInRange(j);
                 }
             }
-            else if ((j >= metaparam_offset) && (j < (metaparam_offset + n_customcontrollers)))
-            {
-                int cc = j - metaparam_offset;
-                gui_modsrc[ms_ctrl1 + cc]->setValue(
-                    ((ControllerModulationSource *)synth->storage.getPatch()
-                         .scene[current_scene]
-                         .modsources[ms_ctrl1 + cc])
-                        ->get_target01());
-            }
             else if ((j >= 0) && (j < n_total_params) && nonmod_param[j])
             {
                 /*

src/gui/SurgeGUIEditorTags.h

@@ -38,8 +38,6 @@ enum SurgeGUIEditorTags
 
     tag_mseg_edit,
     tag_lfo_menu,
-    // tag_metaparam,
-    // tag_metaparam_end = tag_metaparam+n_customcontrollers,
     start_paramtags,
 };
 

src/gui/overlays/MSEGEditor.cpp

@@ -55,7 +55,7 @@ struct MSEGControlRegion : public juce::Component,
 
     enum ControlTags
     {
-        tag_segment_nodeedit_mode = metaparam_offset + 1000, // Just to push outside any ID range
+        tag_segment_nodeedit_mode = 1231231, // Just to push outside any ID range
         tag_segment_movement_mode,
         tag_vertical_snap,
         tag_vertical_value,