From 298ec7fc0c7c13d86e6d8a23d79d7fa5cf0c1dd7 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Thu, 7 May 2020 18:26:29 +0200
Subject: [PATCH] Change the name of the envelope variables and filters

---
 src/sfizz/Voice.cpp | 19 ++++++++++---------
 src/sfizz/Voice.h   |  4 ++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index 4692930e..8b69592a 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -22,7 +22,7 @@ sfz::Voice::Voice(sfz::Resources& resources)
     for (WavetableOscillator& osc : waveOscillators)
         osc.init(sampleRate);
 
-    for (auto & filter : channelPowerFilters)
+    for (auto & filter : channelEnvelopeFilters)
         filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate));
 }
 
@@ -195,7 +195,7 @@ void sfz::Voice::setSampleRate(float sampleRate) noexcept
 {
     this->sampleRate = sampleRate;
 
-    for (auto & filter : channelPowerFilters)
+    for (auto & filter : channelEnvelopeFilters)
         filter.setGain(vaGain(config::filteredEnvelopeCutoff, sampleRate));
 
     for (WavetableOscillator& osc : waveOscillators)
@@ -624,10 +624,10 @@ void sfz::Voice::reset() noexcept
     floatPositionOffset = 0.0f;
     noteIsOff = false;
 
-    for (auto& f : channelPowerFilters)
+    for (auto& f : channelEnvelopeFilters)
         f.reset();
 
-    for (auto& p : channelPowers)
+    for (auto& p : smoothedChannelEnvelopes)
         p = 0.0f;
 
     filters.clear();
@@ -636,7 +636,7 @@ void sfz::Voice::reset() noexcept
 
 float sfz::Voice::getAverageEnvelope() const noexcept
 {
-    return max(channelPowers[0], channelPowers[1]);
+    return max(smoothedChannelEnvelopes[0], smoothedChannelEnvelopes[1]);
 }
 
 bool sfz::Voice::releasedOrFree() const noexcept
@@ -723,14 +723,15 @@ void sfz::Voice::setupOscillatorUnison()
 
 void sfz::Voice::updateChannelPowers(AudioSpan<float> buffer)
 {
-    assert(channelPowers.size() == channelPowerFilters.size());
-    assert(buffer.getNumFrames() <= channelPowerFilters.size());
+    assert(smoothedChannelEnvelopes.size() == channelEnvelopeFilters.size());
+    assert(buffer.getNumFrames() <= channelEnvelopeFilters.size());
     if (buffer.getNumFrames() == 0)
         return;
 
-    for (unsigned i = 0; i < channelPowers.size(); ++i) {
+    for (unsigned i = 0; i < smoothedChannelEnvelopes.size(); ++i) {
         const auto input = buffer.getConstSpan(i);
         for (unsigned s = 0; s < buffer.getNumFrames(); ++s)
-            channelPowers[i] = channelPowerFilters[i].tickLowpass(std::abs(input[s]));
+            smoothedChannelEnvelopes[i] =
+                channelEnvelopeFilters[i].tickLowpass(std::abs(input[s]));
     }
 }
diff --git a/src/sfizz/Voice.h b/src/sfizz/Voice.h
index 0a617a82..a6fbc187 100644
--- a/src/sfizz/Voice.h
+++ b/src/sfizz/Voice.h
@@ -309,8 +309,8 @@ private:
 
     std::normal_distribution<float> noiseDist { 0, config::noiseVariance };
 
-    std::array<OnePoleFilter<float>, 2> channelPowerFilters;
-    std::array<float, 2> channelPowers;
+    std::array<OnePoleFilter<float>, 2> channelEnvelopeFilters;
+    std::array<float, 2> smoothedChannelEnvelopes;
     LEAK_DETECTOR(Voice);
 };