sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ensure to update all variables on early return

Browse source
This commit is contained in:
Jean Pierre Cimalando 2020-08-22 01:11:17 +02:00
parent 84bb553292
commit d2f77f63dc
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/sfizz/FlexEnvelope.cpp
View file

@ -129,13 +129,12 @@ void FlexEnvelope::Impl::process(absl::Span<float> out)
}
size_t frameIndex = 0;
absl::optional<size_t> framesUntilRelease = currentFramesUntilRelease_;
while (frameIndex < numFrames) {
// Check for release
if (framesUntilRelease && *framesUntilRelease == 0) {
if (currentFramesUntilRelease_ && *currentFramesUntilRelease_ == 0) {
isReleased_ = true;
framesUntilRelease = absl::nullopt;
currentFramesUntilRelease_ = absl::nullopt;
}
// Perform stage transitions
@ -150,8 +149,8 @@ void FlexEnvelope::Impl::process(absl::Span<float> out)
// Process without going past the release point, if there is one
size_t maxFrameIndex = numFrames;
if (framesUntilRelease)
maxFrameIndex = std::min(maxFrameIndex, frameIndex + *framesUntilRelease);
if (currentFramesUntilRelease_)
maxFrameIndex = std::min(maxFrameIndex, frameIndex + *currentFramesUntilRelease_);
// Process the current stage
float time = currentTime_;
@ -173,13 +172,11 @@ void FlexEnvelope::Impl::process(absl::Span<float> out)
currentLevel_ = level;
// Update the counter to release
if (framesUntilRelease)
*framesUntilRelease -= framesDone;
if (currentFramesUntilRelease_)
*currentFramesUntilRelease_ -= framesDone;
currentTime_ = time;
}
currentFramesUntilRelease_ = framesUntilRelease;
}
bool FlexEnvelope::Impl::advanceToNextStage()