Merge pull request #204 from jpcima/fix-loops

Fix the use of file loop markers
This commit is contained in:
Paul Ferrand 2020-05-01 10:53:19 +02:00 committed by GitHub
commit 1a41cbc52c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -363,8 +363,6 @@ bool sfz::Synth::loadSfzFile(const fs::path& file)
}
region->sampleEnd = std::min(region->sampleEnd, fileInformation->end);
if (region->loopRange.getEnd() == Default::loopRange.getEnd())
region->loopRange.setEnd(region->sampleEnd);
if (fileInformation->loopBegin != Default::loopRange.getStart() && fileInformation->loopEnd != Default::loopRange.getEnd()) {
if (region->loopRange.getStart() == Default::loopRange.getStart())
@ -377,6 +375,9 @@ bool sfz::Synth::loadSfzFile(const fs::path& file)
region->loopMode = SfzLoopMode::loop_continuous;
}
if (region->loopRange.getEnd() == Default::loopRange.getEnd())
region->loopRange.setEnd(region->sampleEnd);
if (fileInformation->numChannels == 2)
region->hasStereoSample = true;