Back down that voice tracker change partly (#4974)

Back down the indexed modulators But keep the intfastructure and bug fixed that came with it Reopens #4286
surge-synthesizer · Sep 2, 2021 · 615468e · 615468e
1 parent 1417abb
commit 615468e
Showing 1 changed file with 4 additions and 28 deletions.
diff --git a/src/common/SurgeSynthesizer.cpp b/src/common/SurgeSynthesizer.cpp
@@ -36,7 +36,7 @@
 
 using namespace std;
 
-using CMSKey = ControllerModulationSourceVector<2>;
+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),
@@ -124,10 +124,6 @@ SurgeSynthesizer::SurgeSynthesizer(PluginLayer *parent, const std::string &suppl
         ((CMSKey *)scene.modsources[ms_highest_key])->init(0, 0.f);
         ((CMSKey *)scene.modsources[ms_latest_key])->init(0, 0.f);
 
-        ((CMSKey *)scene.modsources[ms_lowest_key])->init(1, 0.f);
-        ((CMSKey *)scene.modsources[ms_highest_key])->init(1, 0.f);
-        ((CMSKey *)scene.modsources[ms_latest_key])->init(1, 0.f);
-
         scene.modsources[ms_random_bipolar] = new RandomModulationSource(true);
         scene.modsources[ms_random_unipolar] = new RandomModulationSource(false);
         scene.modsources[ms_alternate_bipolar] = new AlternateModulationSource(true);
@@ -1268,10 +1264,8 @@ void SurgeSynthesizer::updateHighLowKeys(int scene)
     {
         auto pitch = v->state.pkey;
         auto vkey = v->state.key;
-        if (vkey == highest)
-            highestP = pitch;
-        if (vkey == lowest)
-            lowestP = pitch;
+        highestP = std::max(pitch, highestP);
+        lowestP = std::min(pitch, lowestP);
         if (vkey == latest)
             latestP = pitch;
     }
@@ -1282,12 +1276,6 @@ void SurgeSynthesizer::updateHighLowKeys(int scene)
     else if (resetToZeroOnLastRelease)
         ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_lowest_key])->init(0, 0.f);
 
-    if (lowestP < std::numeric_limits<float>::max())
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_lowest_key])
-            ->init(1, (lowestP - ktRoot) * twelfth);
-    else if (resetToZeroOnLastRelease)
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_lowest_key])->init(1, 0.f);
-
     if (highest >= 0)
     {
         ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_highest_key])
@@ -1298,23 +1286,14 @@ void SurgeSynthesizer::updateHighLowKeys(int scene)
         ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_highest_key])->init(0, 0.f);
     }
 
-    if (highestP > std::numeric_limits<float>::min())
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_highest_key])
-            ->init(1, (highestP - ktRoot) * twelfth);
-    else if (resetToZeroOnLastRelease)
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_highest_key])->init(1, 0.f);
-
     if (latest >= 0)
     {
         ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_latest_key])
             ->init(0, (latest - ktRoot) * twelfth);
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_latest_key])
-            ->init(1, (latestP - ktRoot) * twelfth);
     }
     else if (resetToZeroOnLastRelease)
     {
         ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_latest_key])->init(0, 0.f);
-        ((CMSKey *)storage.getPatch().scene[scene].modsources[ms_latest_key])->init(1, 0.f);
     }
 }
 
@@ -2810,8 +2789,7 @@ bool SurgeSynthesizer::supportsIndexedModulator(int scene, modsources modsource)
         return lf->shape.val.i == lt_formula;
     }
 
-    if (modsource == ms_random_bipolar || modsource == ms_random_unipolar ||
-        modsource == ms_highest_key || modsource == ms_latest_key || modsource == ms_lowest_key)
+    if (modsource == ms_random_bipolar || modsource == ms_random_unipolar)
     {
         return true;
     }
@@ -2832,8 +2810,6 @@ int SurgeSynthesizer::getMaxModulationIndex(int scene, modsources modsource) con
         return 2;
     if (modsource == ms_random_unipolar)
         return 2;
-    if (modsource == ms_highest_key || modsource == ms_latest_key || modsource == ms_lowest_key)
-        return 2;
     return 1;
 }