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

Change the looping logic

Browse source 
The outer loop point is now taken into account
This commit is contained in:
Paul Ferrand 2020-01-27 09:45:43 +01:00
parent 916e269bf6
commit 603b3049bf
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/sfizz/Voice.cpp
View file

@ -395,10 +395,10 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
absl::optional<int> releaseAt {}; absl::optional<int> releaseAt {};
if (region->shouldLoop() && region->loopEnd(currentPromise->oversamplingFactor) <= source.getNumFrames()) { if (region->shouldLoop() && region->loopEnd(currentPromise->oversamplingFactor) <= source.getNumFrames()) {
const auto loopEnd = static_cast<int>(region->loopEnd(currentPromise->oversamplingFactor)) - 1; const auto loopEnd = static_cast<int>(region->loopEnd(currentPromise->oversamplingFactor));
const auto offset = loopEnd - static_cast<int>(region->loopStart(currentPromise->oversamplingFactor)); const auto offset = loopEnd - static_cast<int>(region->loopStart(currentPromise->oversamplingFactor)) + 1;
for (auto* index = indices.begin(); index < indices.end(); ++index) { for (auto* index = indices.begin(); index < indices.end(); ++index) {
if (*index >= loopEnd) { if (*index > loopEnd) {
const auto remainingElements = static_cast<size_t>(std::distance(index, indices.end())); const auto remainingElements = static_cast<size_t>(std::distance(index, indices.end()));
subtract<int>(offset, { index, remainingElements }); subtract<int>(offset, { index, remainingElements });
} }
@ -429,8 +429,8 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
auto ind = indices.data(); auto ind = indices.data();
auto leftCoeff = leftCoeffs.data(); auto leftCoeff = leftCoeffs.data();
auto rightCoeff = rightCoeffs.data(); auto rightCoeff = rightCoeffs.data();
auto leftSource = source.getConstSpan(0);
auto left = buffer.getChannel(0); auto left = buffer.getChannel(0);
auto leftSource = source.getChannel(0);
if (source.getNumChannels() == 1) { if (source.getNumChannels() == 1) {
while (ind < indices.end()) { while (ind < indices.end()) {
*left = linearInterpolation(leftSource[*ind], leftSource[*ind + 1], *leftCoeff, *rightCoeff); *left = linearInterpolation(leftSource[*ind], leftSource[*ind + 1], *leftCoeff, *rightCoeff);
@ -438,7 +438,7 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
} }
} else { } else {
auto right = buffer.getChannel(1); auto right = buffer.getChannel(1);
auto rightSource = source.getChannel(1); auto rightSource = source.getConstSpan(1);
while (ind < indices.end()) { while (ind < indices.end()) {
*left = linearInterpolation(leftSource[*ind], leftSource[*ind + 1], *leftCoeff, *rightCoeff); *left = linearInterpolation(leftSource[*ind], leftSource[*ind + 1], *leftCoeff, *rightCoeff);
*right = linearInterpolation(rightSource[*ind], rightSource[*ind + 1], *leftCoeff, *rightCoeff); *right = linearInterpolation(rightSource[*ind], rightSource[*ind + 1], *leftCoeff, *rightCoeff);