From ca2ee8dc58bd890c300f71fdd9725683e999f8da Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Sun, 29 Mar 2020 19:26:08 +0200 Subject: [PATCH] Voice cleanups --- src/sfizz/Voice.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp index 596250a8..8b22323a 100644 --- a/src/sfizz/Voice.cpp +++ b/src/sfizz/Voice.cpp @@ -280,11 +280,9 @@ void sfz::Voice::processMono(AudioSpan buffer) noexcept auto rightBuffer = buffer.getSpan(1); auto modulationBuffer = resources.bufferPool.getBuffer(numSamples); - auto tempBuffer = resources.bufferPool.getBuffer(numSamples); - if (!modulationBuffer || !tempBuffer) + if (!modulationBuffer) return; auto modulationSpan = absl::MakeSpan(*modulationBuffer).first(numSamples); - auto tempSpan = absl::MakeSpan(*tempBuffer).first(numSamples); { // Amplitude processing ScopedTiming logger { amplitudeDuration }; @@ -294,9 +292,9 @@ void sfz::Voice::processMono(AudioSpan buffer) noexcept getLinearEnvelope(region->amplitudeCC, resources.midiState, modulationSpan, [](const float& modifier, float value){ return value * modifier; }); - DBG("Amplitude curve back: " << modulationSpan.back()); + // DBG("Amplitude curve back: " << modulationSpan.back()); add(baseGain, modulationSpan); - DBG("FInal gain: " << modulationSpan.back()); + // DBG("Final gain: " << modulationSpan.back()); applyGain(modulationSpan, leftBuffer); // Crossfade envelopes @@ -306,14 +304,14 @@ void sfz::Voice::processMono(AudioSpan buffer) noexcept return crossfadeIn(range, value, region->crossfadeCCCurve); }); applyGain(modulationSpan, leftBuffer); - DBG("XFin: " << modulationSpan.back()); + // DBG("XFin: " << modulationSpan.back()); fill(modulationSpan, 1.0f); getLinearEnvelope>(region->crossfadeCCOutRange, resources.midiState, modulationSpan, [this](const Range& range, float value){ return crossfadeOut(range, value, region->crossfadeCCCurve); }); applyGain(modulationSpan, leftBuffer); - DBG("XFout: " << modulationSpan.back()); + // DBG("XFout: " << modulationSpan.back()); // Volume envelope volumeEnvelope.getBlock(modulationSpan); @@ -359,11 +357,9 @@ void sfz::Voice::processStereo(AudioSpan buffer) noexcept auto rightBuffer = buffer.getSpan(1); auto modulationBuffer = resources.bufferPool.getBuffer(numSamples); - auto tempBuffer = resources.bufferPool.getBuffer(numSamples); - if (!modulationBuffer || !tempBuffer) + if (!modulationBuffer) return; auto modulationSpan = absl::MakeSpan(*modulationBuffer).first(numSamples); - auto tempSpan = absl::MakeSpan(*tempBuffer).first(numSamples); { // Amplitude processing ScopedTiming logger { amplitudeDuration };