From e85c7025fa893d66e404bd5c39ea8446e1058328 Mon Sep 17 00:00:00 2001
From: Michael Willis <willismichael@gmail.com>
Date: Sat, 18 Jan 2020 22:56:36 -0700
Subject: [PATCH 1/3] Support updated crossfading during note playback

---
 src/sfizz/Voice.cpp | 17 ++++++++++++++++-
 src/sfizz/Voice.h   |  1 +
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index c1aba0f6..ee571581 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -66,7 +66,6 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, uint8_t value
     volumeEnvelope.reset(db2mag(Default::volumeRange.clamp(volumedB)));
 
     baseGain = region->getBaseGain();
-    baseGain *= region->getCrossfadeGain(midiState.getCCArray());
     if (triggerType != TriggerType::CC)
         baseGain *= region->getNoteGain(number, value);
 
@@ -75,6 +74,9 @@ void sfz::Voice::startVoice(Region* region, int delay, int number, uint8_t value
         gain *= normalizeCC(midiState.getCCValue(region->amplitudeCC->first)) * normalizePercents(region->amplitudeCC->second);
     amplitudeEnvelope.reset(Default::normalizedRange.clamp(gain));
 
+    float crossfadeGain { region->getCrossfadeGain(midiState.getCCArray()) };
+    crossfadeEnvelope.reset(Default::normalizedRange.clamp(crossfadeGain));
+
     basePan = normalizeNegativePercents(region->pan);
     auto pan { basePan };
     if (region->panCC)
@@ -202,6 +204,11 @@ void sfz::Voice::registerCC(int delay, int ccNumber, uint8_t ccValue) noexcept
         const float newWidth { baseWidth + normalizeCC(ccValue) * normalizeNegativePercents(region->widthCC->second) };
         widthEnvelope.registerEvent(delay, Default::symmetricNormalizedRange.clamp(newWidth));
     }
+
+    if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCInRange.contains(ccNumber)) {
+      const float crossfadeGain = region->getCrossfadeGain(midiState.getCCArray());
+      crossfadeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(crossfadeGain));
+    }
 }
 
 void sfz::Voice::registerPitchWheel(int delay, int pitch) noexcept
@@ -284,6 +291,10 @@ void sfz::Voice::processMono(AudioSpan<float> buffer) noexcept
     amplitudeEnvelope.getBlock(span1);
     applyGain<float>(span1, leftBuffer);
 
+    // Crossfade envelope
+    crossfadeEnvelope.getBlock(span1);
+    buffer.applyGain(span1);
+
     // Volume envelope
     volumeEnvelope.getBlock(span1);
     applyGain<float>(span1, leftBuffer);
@@ -324,6 +335,10 @@ void sfz::Voice::processStereo(AudioSpan<float> buffer) noexcept
     amplitudeEnvelope.getBlock(span1);
     buffer.applyGain(span1);
 
+    // Crossfade envelope
+    crossfadeEnvelope.getBlock(span1);
+    buffer.applyGain(span1);
+
     // Volume envelope
     volumeEnvelope.getBlock(span1);
     buffer.applyGain(span1);
diff --git a/src/sfizz/Voice.h b/src/sfizz/Voice.h
index 42b0b8df..9c0bb35d 100644
--- a/src/sfizz/Voice.h
+++ b/src/sfizz/Voice.h
@@ -302,6 +302,7 @@ private:
 
     ADSREnvelope<float> egEnvelope;
     LinearEnvelope<float> amplitudeEnvelope; // linear events
+    LinearEnvelope<float> crossfadeEnvelope;
     LinearEnvelope<float> panEnvelope;
     LinearEnvelope<float> positionEnvelope;
     LinearEnvelope<float> widthEnvelope;

From 5873814272be5e891a4624ad068bce3774108946 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 19 Jan 2020 07:14:06 +0100
Subject: [PATCH 2/3] Typo in the second crossfade check on CC dispatch

---
 src/sfizz/Voice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index ee571581..b537f525 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -205,7 +205,7 @@ void sfz::Voice::registerCC(int delay, int ccNumber, uint8_t ccValue) noexcept
         widthEnvelope.registerEvent(delay, Default::symmetricNormalizedRange.clamp(newWidth));
     }
 
-    if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCInRange.contains(ccNumber)) {
+    if (region->crossfadeCCInRange.contains(ccNumber) || region->crossfadeCCOutRange.contains(ccNumber)) {
       const float crossfadeGain = region->getCrossfadeGain(midiState.getCCArray());
       crossfadeEnvelope.registerEvent(delay, Default::normalizedRange.clamp(crossfadeGain));
     }

From ffebe9df9a3474d68b7869c52dc284a79888049e Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 19 Jan 2020 07:16:20 +0100
Subject: [PATCH 3/3] Mono process for the crossfade envelope

The right channel should be blank at this point of the process so you only need to apply the envelope to the left channel
---
 src/sfizz/Voice.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index b537f525..573bc458 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -293,7 +293,7 @@ void sfz::Voice::processMono(AudioSpan<float> buffer) noexcept
 
     // Crossfade envelope
     crossfadeEnvelope.getBlock(span1);
-    buffer.applyGain(span1);
+    applyGain<float>(span1, leftBuffer);
 
     // Volume envelope
     volumeEnvelope.getBlock(span1);