Merge branch 'hotfix/issue-4'

sfztools · Sep 29, 2019 · 50e20c0 · 50e20c0
2 parents 3efaeac + ae6f106
commit 50e20c0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/sfizz/Voice.cpp b/sfizz/Voice.cpp
@@ -239,18 +239,16 @@ void sfz::Voice::renderBlock(AudioSpan<float> buffer) noexcept
     auto delay = min(static_cast<size_t>(initialDelay), buffer.getNumFrames());
     auto delayed_buffer = buffer.subspan(delay);
     initialDelay -= delay;
-    if (delayed_buffer.getNumFrames() == 0)
-        return;
 
     if (region->isGenerator())
         fillWithGenerator(delayed_buffer);
     else
         fillWithData(delayed_buffer);
 
     if (region->isStereo())
-        processStereo(delayed_buffer);
+        processStereo(buffer);
     else
-        processMono(delayed_buffer);
+        processMono(buffer);
 
     if (!egEnvelope.isSmoothing())
         reset();
@@ -350,6 +348,9 @@ void sfz::Voice::processStereo(AudioSpan<float> buffer) noexcept
 
 void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
 {
+    if (buffer.getNumFrames() == 0)
+        return;
+
     auto source { [&]() {
         if (region->canUsePreloadedData())
             return AudioSpan<const float>(*region->preloadedData);
@@ -435,6 +436,9 @@ void sfz::Voice::fillWithGenerator(AudioSpan<float> buffer) noexcept
     if (region->sample != "*sine")
         return;
 
+    if (buffer.getNumFrames() == 0)
+        return;
+
     float step = baseFrequency * twoPi<float> / sampleRate;
     phase = linearRamp<float>(tempSpan1, phase, step);