Rebase on the new modifiers

This commit is contained in:
Paul Fd 2020-04-07 18:26:04 +02:00 committed by Jean Pierre Cimalando
parent 7a59b35b80
commit 0ceb58e6ae
2 changed files with 2 additions and 2 deletions

View file

@ -1145,7 +1145,7 @@ uint64_t sfz::Region::getOffset(Oversampling factor) const noexcept
std::uniform_int_distribution<int64_t> offsetDistribution { 0, offsetRandom };
uint64_t finalOffset = offset + offsetDistribution(Random::randomGenerator);
for (const auto& mod: offsetCC)
finalOffset += static_cast<uint64_t>(mod.value * midiState.getCCValue(mod.cc));
finalOffset += static_cast<uint64_t>(mod.data * midiState.getCCValue(mod.cc));
return Default::offsetCCRange.clamp(offset + offsetDistribution(Random::randomGenerator)) * static_cast<uint64_t>(factor);
}

View file

@ -377,7 +377,7 @@ bool sfz::Synth::loadSfzFile(const fs::path& file)
const auto maxOffset = [region]() {
uint64_t sumOffsetCC = region->offset + region->offsetRandom;
for (const auto& offsets: region->offsetCC)
sumOffsetCC += offsets.value;
sumOffsetCC += offsets.data;
return Default::offsetCCRange.clamp(sumOffsetCC);
}();