Non-clicky fade-out in voice terminate mode

baconpaul · Dec 23, 2024 · 0f943db · 0f943db
1 parent 2240f89
commit 0f943db
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/src/synth/synth.cpp b/src/synth/synth.cpp
@@ -75,7 +75,9 @@ void Synth::process(const clap_output_events_t *outq)
             mech::accumulate_from_to<blockSize>(cvoice->output[1], lOutput[1]);
 
             if (cvoice->out.env.stage >
-                sst::basic_blocks::modulators::DAHDSREnvelope<SRProvider, blockSize>::s_release)
+                    sst::basic_blocks::modulators::DAHDSREnvelope<SRProvider,
+                                                                  blockSize>::s_release ||
+                cvoice->fadeBlocks == 0)
             {
                 responder.doVoiceEndCallback(cvoice);
                 cvoice = removeFromVoiceList(cvoice);
@@ -134,6 +136,7 @@ Voice *Synth::removeFromVoiceList(Voice *cvoice)
     }
     auto nv = cvoice->next;
     cvoice->used = false;
+    cvoice->fadeBlocks = -1;
     cvoice->next = nullptr;
     cvoice->prior = nullptr;
     return nv;

diff --git a/src/synth/synth.h b/src/synth/synth.h
@@ -93,9 +93,8 @@ struct Synth
         void endVoiceCreationTransaction(uint16_t, uint16_t, uint16_t, int32_t, float) {}
         void terminateVoice(Voice *voice)
         {
-            voice->used = false;
             voice->gated = false;
-            synth.removeFromVoiceList(voice);
+            voice->fadeBlocks = Voice::fadeOverBlocks;
         }
         int32_t initializeMultipleVoices(
             int32_t ct,

diff --git a/src/synth/voice.cpp b/src/synth/voice.cpp
@@ -86,6 +86,18 @@ void Voice::renderBlock()
     }
 
     out.renderBlock(gated, velocity);
+
+    if (fadeBlocks > 0)
+    {
+        for (int i = 0; i < blockSize; ++i)
+        {
+            auto fp = fadeBlocks * blockSize - i;
+            auto at = fp * dFade;
+            out.output[0][i] *= at;
+            out.output[1][i] *= at;
+        }
+        fadeBlocks--;
+    }
 }
 
 static_assert(numOps == 6, "Rebuild this table if not");

diff --git a/src/synth/voice.h b/src/synth/voice.h
@@ -58,6 +58,9 @@ struct Voice
     void retriggerAllEnvelopes();
 
     std::array<MixerNode, numOps> mixerNode;
+    static constexpr int32_t fadeOverBlocks{32};
+    float dFade{1.0 / (blockSize * fadeOverBlocks)};
+    int32_t fadeBlocks{-1};
 
     OutputNode out;