Merge pull request #717 from jpcima/voice-ring

Fix voice ring corruption when the instrument has disabled regions

src/sfizz/SisterVoiceRing.h

@@ -6,6 +6,7 @@
 #pragma once
 
 #include "Voice.h"
+#include "Debug.h"
 #include "absl/meta/type_traits.h"
 
 namespace sfz
@@ -135,31 +136,20 @@ public:
      * @param voice
      */
     void addVoiceToRing(Voice* voice) noexcept {
-        if (firstStartedVoice == nullptr)
+        ASSERT(!voice->isInSisterRing());
-            firstStartedVoice = voice;
 
-        firstStartedVoice->setPreviousSisterVoice(voice);
+        Voice* next = head_;
-        voice->setNextSisterVoice(firstStartedVoice);
+        if (!next)
+            head_ = next = voice;
 
-        if (lastStartedVoice != nullptr) {
+        Voice* previous = next->getPreviousSisterVoice();
-            voice->setPreviousSisterVoice(lastStartedVoice);
+        voice->setNextSisterVoice(next);
-            lastStartedVoice->setNextSisterVoice(voice);
+        voice->setPreviousSisterVoice(previous);
-        }
+        next->setPreviousSisterVoice(voice);
-
+        previous->setNextSisterVoice(voice);
-        lastStartedVoice = voice;
     }
-    /**
-     * @brief Apply a function to the sister ring, including the current voice.
-     * This function should be safe enough to even reset the sister voices, but
-     * if you mutate the ring significantly you should probably roll your own
-     * iterator.
-     *
-     * @param lambda the function to apply.
-     * @param voice the starting voice
-     */
 private:
-    Voice* firstStartedVoice { nullptr };
+    Voice* head_ { nullptr };
-    Voice* lastStartedVoice { nullptr };
 };
 
 }

src/sfizz/Synth.cpp

@@ -1066,8 +1066,8 @@ void Synth::Impl::startVoice(Region* region, int delay, const TriggerEvent& trig
         return;
 
     ASSERT(selectedVoice->isFree());
-    selectedVoice->startVoice(region, delay, triggerEvent);
+    if (selectedVoice->startVoice(region, delay, triggerEvent))
-    ring.addVoiceToRing(selectedVoice);
+        ring.addVoiceToRing(selectedVoice);
 }
 
 void Synth::Impl::noteOffDispatch(int delay, int noteNumber, float velocity) noexcept

src/sfizz/Voice.cpp

@@ -358,19 +358,22 @@ Voice::Impl::Impl(int voiceNumber, Resources& resources)
     getSCurve();
 }
 
-void Voice::startVoice(Region* region, int delay, const TriggerEvent& event) noexcept
+bool Voice::startVoice(Region* region, int delay, const TriggerEvent& event) noexcept
 {
     Impl& impl = *impl_;
     ASSERT(event.value >= 0.0f && event.value <= 1.0f);
 
     impl.region_ = region;
-    if (region->disabled())
-        return;
 
     impl.triggerEvent_ = event;
     if (impl.triggerEvent_.type == TriggerEventType::CC)
         impl.triggerEvent_.number = region->pitchKeycenter;
 
+    if (region->disabled()) {
+        impl.switchState(State::cleanMeUp);
+        return false;
+    }
+
     impl.switchState(State::playing);
 
     ASSERT(delay >= 0);
@@ -414,7 +417,7 @@ void Voice::startVoice(Region* region, int delay, const TriggerEvent& event) noe
         impl.currentPromise_ = impl.resources_.filePool.getFilePromise(region->sampleId);
         if (!impl.currentPromise_) {
             impl.switchState(State::cleanMeUp);
-            return;
+            return false;
         }
         impl.updateLoopInformation();
         impl.speedRatio_ = static_cast<float>(impl.currentPromise_->information.sampleRate / impl.sampleRate_);
@@ -455,6 +458,8 @@ void Voice::startVoice(Region* region, int delay, const TriggerEvent& event) noe
 
     impl.resources_.modMatrix.initVoice(impl.id_, region->getId(), impl.initialDelay_);
     impl.saveModulationTargets(region);
+
+    return true;
 }
 
 int Voice::Impl::getCurrentSampleQuality() const noexcept
@@ -628,7 +633,8 @@ void Voice::renderBlock(AudioSpan<float> buffer) noexcept
     ASSERT(static_cast<int>(buffer.getNumFrames()) <= impl.samplesPerBlock_);
     buffer.fill(0.0f);
 
-    if (impl.region_ == nullptr)
+    const Region* region = impl.region_;
+    if (region == nullptr || region->disabled())
         return;
 
     const auto delay = min(static_cast<size_t>(impl.initialDelay_), buffer.getNumFrames());
@@ -637,13 +643,13 @@ void Voice::renderBlock(AudioSpan<float> buffer) noexcept
 
     { // Fill buffer with raw data
         ScopedTiming logger { impl.dataDuration_ };
-        if (impl.region_->isOscillator())
+        if (region->isOscillator())
             impl.fillWithGenerator(delayed_buffer);
         else
             impl.fillWithData(delayed_buffer);
     }
 
-    if (impl.region_->isStereo()) {
+    if (region->isStereo()) {
         impl.ampStageStereo(buffer);
         impl.panStageStereo(buffer);
         impl.filterStageStereo(buffer);
@@ -653,12 +659,12 @@ void Voice::renderBlock(AudioSpan<float> buffer) noexcept
         impl.panStageMono(buffer);
     }
 
-    if (!impl.region_->flexAmpEG) {
+    if (!region->flexAmpEG) {
         if (!impl.egAmplitude_.isSmoothing())
             impl.switchState(State::cleanMeUp);
     }
     else {
-        if (impl.flexEGs_[*impl.region_->flexAmpEG]->isFinished())
+        if (impl.flexEGs_[*region->flexAmpEG]->isFinished())
             impl.switchState(State::cleanMeUp);
     }
 
@@ -1476,12 +1482,13 @@ bool Voice::Impl::released() const noexcept
 bool Voice::checkOffGroup(const Region* other, int delay, int noteNumber) noexcept
 {
     Impl& impl = *impl_;
-    if (impl.region_ == nullptr || other == nullptr)
+    const Region* region = impl.region_;
+    if (region == nullptr || other == nullptr)
         return false;
 
     if (impl.triggerEvent_.type == TriggerEventType::NoteOn
-        && impl.region_->offBy == other->group
+        && region->offBy == other->group
-        && (impl.region_->group != other->group || noteNumber != impl.triggerEvent_.number)) {
+        && (region->group != other->group || noteNumber != impl.triggerEvent_.number)) {
         off(delay);
         return true;
     }

src/sfizz/Voice.h

@@ -102,8 +102,9 @@ public:
      * @param region
      * @param delay
      * @param evebt
+     * @return bool
      */
-    void startVoice(Region* region, int delay, const TriggerEvent& event) noexcept;
+    bool startVoice(Region* region, int delay, const TriggerEvent& event) noexcept;
 
     /**
      * @brief Get the sample quality determined by the active region.
@@ -382,6 +383,12 @@ public:
      */
     const TriggerEvent& getTriggerEvent();
 
+public:
+    /**
+     * @brief Check if the voice already belongs to a sister ring
+     */
+    bool isInSisterRing() const noexcept { return this != nextSisterVoice_; }
+
 private:
     struct Impl;
     std::unique_ptr<Impl> impl_;