Move interpolation type from Variants to SingleVariant (#1283)

* move interpolation type from Variants to SingleVariant * fix clang format * Add the streaming for interpoation on SingleVariant --------- Co-authored-by: Paul Walker <[email protected]>
surge-synthesizer · Sep 8, 2024 · 61fb9a2 · 61fb9a2
1 parent 15f8c82
commit 61fb9a2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git a/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp b/src-ui/app/edit-screen/components/mapping-pane/VariantDisplay.cpp
@@ -502,7 +502,7 @@ void VariantDisplay::rebuild()
         break;
     }
 
-    switch (variantView.interpolationType)
+    switch (variantView.variants[selectedVariation].interpolationType)
     {
     case dsp::InterpolationTypes::Sinc:
         srcButton->setLabel("SINC");
@@ -727,12 +727,13 @@ void VariantDisplay::showSRCMenu()
     p.addSeparator();
 
     auto add = [&p, this](auto e, auto n) {
-        p.addItem(n, true, variantView.interpolationType == e, [this, e]() {
-            variantView.interpolationType = e;
-            connectors::updateSingleValue<cmsg::UpdateZoneVariantsInt16TValue>(
-                variantView, variantView.interpolationType, this);
-            rebuild();
-        });
+        p.addItem(
+            n, true, variantView.variants[selectedVariation].interpolationType == e, [this, e]() {
+                variantView.variants[selectedVariation].interpolationType = e;
+                connectors::updateSingleValue<cmsg::UpdateZoneVariantsInt16TValue>(
+                    variantView, variantView.variants[selectedVariation].interpolationType, this);
+                rebuild();
+            });
     };
     add(dsp::InterpolationTypes::Sinc, "Sinc");
     add(dsp::InterpolationTypes::Linear, "Linear");

diff --git a/src/engine/zone.h b/src/engine/zone.h
@@ -109,6 +109,7 @@ struct Zone : MoveableOnly<Zone>, HasGroupZoneProcessors<Zone>, SampleRateSuppor
         bool active{false};
         SampleID sampleID;
         int64_t startSample{-1}, endSample{-1}, startLoop{-1}, endLoop{-1};
+        dsp::InterpolationTypes interpolationType{dsp::InterpolationTypes::Sinc};
 
         // VariantMode variantMode{RR};
         PlayMode playMode{NORMAL};
@@ -132,7 +133,6 @@ struct Zone : MoveableOnly<Zone>, HasGroupZoneProcessors<Zone>, SampleRateSuppor
     {
         std::array<SingleVariant, maxVariantsPerZone> variants;
         VariantPlaybackMode variantPlaybackMode{FORWARD_RR};
-        dsp::InterpolationTypes interpolationType{dsp::InterpolationTypes::Sinc};
     } variantData;
 
     std::array<std::shared_ptr<sample::Sample>, maxVariantsPerZone> samplePointers;

diff --git a/src/json/engine_traits.h b/src/json/engine_traits.h
@@ -319,6 +319,7 @@ SC_STREAMDEF(scxt::engine::Zone::SingleVariant, SC_FROM({
                           {"loopMode", s.loopMode},
                           {"loopDirection", s.loopDirection},
                           {"loopCountWhenCounted", s.loopCountWhenCounted},
+                          {"interpolationType", s.interpolationType},
                           {"loopFade", s.loopFade}};
                  }
                  else
@@ -344,6 +345,8 @@ SC_STREAMDEF(scxt::engine::Zone::SingleVariant, SC_FROM({
                      findOrSet(v, "loopDirection", engine::Zone::LoopDirection::FORWARD_ONLY,
                                s.loopDirection);
                      findOrSet(v, "loopFade", 0, s.loopFade);
+                     findOrSet(v, "interpolationType", dsp::InterpolationTypes::Sinc,
+                               s.interpolationType);
                      findOrSet(v, "loopCountWhenCounted", 0, s.loopCountWhenCounted);
                  }
                  else

diff --git a/src/voice/voice.cpp b/src/voice/voice.cpp
@@ -537,7 +537,7 @@ void Voice::initializeGenerator()
         return;
     }
 
-    // but the default of course is to use the sapmle index
+    // but the default of course is to use the sample index
     auto &s = zone->samplePointers[sampleIndex];
     auto &variantData = zone->variantData.variants[sampleIndex];
     assert(s);
@@ -598,7 +598,7 @@ void Voice::initializeGenerator()
                                             variantData.loopDirection == engine::Zone::FORWARD_ONLY,
                                             variantData.loopMode == engine::Zone::LOOP_WHILE_GATED);
 
-    GD.interpolationType = zone->variantData.interpolationType;
+    GD.interpolationType = variantData.interpolationType;
 }
 
 float Voice::calculateVoicePitch()