Factor -> Amplitude

surge-synthesizer · Aug 23, 2024 · aadb560 · aadb560
1 parent 16db836
commit aadb560
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/engine/zone.h b/src/engine/zone.h
@@ -119,7 +119,7 @@ struct Zone : MoveableOnly<Zone>, HasGroupZoneProcessors<Zone>, SampleRateSuppor
         int loopCountWhenCounted{0};
 
         int64_t loopFade{0};
-        float normalizationFactor{1.f}; // db
+        float normalizationAmplitude{1.f}; // db
         // per-sample pitch and amplitude
         float pitchOffset{0.f}; // semitones
         float amplitude{1.f};   // db
@@ -129,7 +129,7 @@ struct Zone : MoveableOnly<Zone>, HasGroupZoneProcessors<Zone>, SampleRateSuppor
             return active == other.active && sampleID == other.sampleID &&
                    startSample == other.startSample && endSample == other.endSample &&
                    startLoop == other.startLoop && endLoop == other.endLoop &&
-                   normalizationFactor == other.normalizationFactor &&
+                   normalizationAmplitude == other.normalizationAmplitude &&
                    pitchOffset == other.pitchOffset && amplitude == other.amplitude;
         }
     };

diff --git a/src/json/engine_traits.h b/src/json/engine_traits.h
@@ -318,7 +318,7 @@ SC_STREAMDEF(scxt::engine::Zone::AssociatedSample, SC_FROM({
                           {"loopDirection", s.loopDirection},
                           {"loopCountWhenCounted", s.loopCountWhenCounted},
                           {"loopFade", s.loopFade},
-                          {"normalizationFactor", s.normalizationFactor},
+                          {"normalizationAmplitude", s.normalizationAmplitude},
                           {"pitchOffset", s.pitchOffset},
                           {"amplitude", s.amplitude}};
                  }
@@ -346,7 +346,7 @@ SC_STREAMDEF(scxt::engine::Zone::AssociatedSample, SC_FROM({
                                s.loopDirection);
                      findOrSet(v, "loopFade", 0, s.loopFade);
                      findOrSet(v, "loopCountWhenCounted", 0, s.loopCountWhenCounted);
-                     findOrSet(v, "normalizationFactor", 1.f, s.normalizationFactor);
+                     findOrSet(v, "normalizationAmplitude", 1.f, s.normalizationAmplitude);
                      findOrSet(v, "pitchOffset", 0.f, s.pitchOffset);
                      findOrSet(v, "amplitude", 1.f, s.amplitude);
                  }