From 74c49c2c8c10c4fe56d2e6fba356ea7c74e37968 Mon Sep 17 00:00:00 2001 From: paulfd Date: Sat, 14 Sep 2019 09:17:34 +0200 Subject: [PATCH] Removed the integer source position for now... --- sfizz/Voice.cpp | 7 ++----- sfizz/Voice.h | 1 - 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sfizz/Voice.cpp b/sfizz/Voice.cpp index ded3d93e..51008612 100644 --- a/sfizz/Voice.cpp +++ b/sfizz/Voice.cpp @@ -55,6 +55,7 @@ void sfz::Voice::startVoice(Region* region, int delay, int channel, int number, pitchRatio = region->getBasePitchVariation(number, value); baseVolumedB = region->getBaseVolumedB(); + auto volumedB { baseVolumedB }; if (region->volumeCC) volumedB += normalizeCC(ccState[region->volumeCC->first]) * region->volumeCC->second; @@ -93,8 +94,7 @@ void sfz::Voice::startVoice(Region* region, int delay, int channel, int number, widthEnvelope.reset(width); // DBG("Base width: " << baseWidth << " - with modifier: " << width); - sourcePosition = region->getOffset(); - floatPosition = static_cast(sourcePosition); + floatPosition = static_cast(region->getOffset()); // DBG("Offset: " << floatPosition); initialDelay = delay + static_cast(region->getDelay() / sampleRate); baseFrequency = midiNoteFrequency(number) * pitchRatio; @@ -418,8 +418,6 @@ void sfz::Voice::fillWithGenerator(AudioSpan buffer) noexcept ::sin(tempSpan1.first(buffer.getNumFrames()), buffer.getSpan(0)); ::copy(buffer.getSpan(0), buffer.getSpan(1)); - - sourcePosition += buffer.getNumFrames(); } bool sfz::Voice::checkOffGroup(int delay, uint32_t group) noexcept @@ -460,7 +458,6 @@ void sfz::Voice::reset() noexcept if (region != nullptr) { DBG("Reset voice with sample " << region->sample); } - sourcePosition = 0; floatPosition = 0.0f; region = nullptr; noteIsOff = false; diff --git a/sfizz/Voice.h b/sfizz/Voice.h index 8bdac781..e5eca6ea 100644 --- a/sfizz/Voice.h +++ b/sfizz/Voice.h @@ -103,7 +103,6 @@ private: float baseFrequency { 440.0 }; float phase { 0.0f }; - uint32_t sourcePosition { 0 }; float floatPosition { 0.0f }; uint32_t initialDelay { 0 };