From 9b115303310e185e795c8692b71b4b676bb23bcf Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 9 Aug 2020 23:17:31 +0200
Subject: [PATCH] Honor the base gain and volume before modifiers

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

diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index 97fa044d..b4f9598a 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -360,12 +360,14 @@ void sfz::Voice::amplitudeEnvelope(absl::Span<float> modulationSpan) noexcept
     egEnvelope.getBlock(modulationSpan);
 
     // Amplitude envelope
+    applyGain1<float>(baseGain, modulationSpan);
     if (float* mod = mm.getModulationByKey(amplitudeKey)) {
         for (size_t i = 0; i < numSamples; ++i)
             modulationSpan[i] *= normalizePercents(mod[i]);
     }
 
     // Volume envelope
+    applyGain1<float>(db2mag(baseVolumedB), modulationSpan);
     if (float* mod = mm.getModulationByKey(volumeKey)) {
         for (size_t i = 0; i < numSamples; ++i)
             modulationSpan[i] *= db2mag(mod[i]);