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

Merge pull request #385 from paulfd/offset-ccs

Browse source 
offset_cc were not taken into account
This commit is contained in:
JP Cimalando 2020-08-21 00:54:03 +02:00 • committed by GitHub
commit 68712140d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sfizz/Region.cpp
View file

@ -1447,7 +1447,7 @@ uint64_t sfz::Region::getOffset(Oversampling factor) const noexcept
uint64_t finalOffset = offset + offsetDistribution(Random::randomGenerator);
for (const auto& mod: offsetCC)
finalOffset += static_cast<uint64_t>(mod.data * midiState.getCCValue(mod.cc));
return Default::offsetCCRange.clamp(offset + offsetDistribution(Random::randomGenerator)) * static_cast<uint64_t>(factor);
return Default::offsetRange.clamp(finalOffset) * static_cast<uint64_t>(factor);
}
float sfz::Region::getDelay() const noexcept

18
tests/RegionT.cpp
View file

@ -1905,3 +1905,21 @@ TEST_CASE("[Region] Release and release key")
REQUIRE( region.delayedReleases == expected );
}
}
TEST_CASE("[Region] Offsets with CCs")
{
MidiState midiState;
Region region { 0, midiState };
region.parseOpcode({ "offset_cc4", "255" });
region.parseOpcode({ "offset", "10" });
REQUIRE( region.getOffset() == 10 );
midiState.ccEvent(0, 4, 127_norm);
REQUIRE( region.getOffset() == 265 );
midiState.ccEvent(0, 4, 100_norm);
REQUIRE( region.getOffset() == 210 );
midiState.ccEvent(0, 4, 10_norm);
REQUIRE( region.getOffset() == 30 );
midiState.ccEvent(0, 4, 0);
REQUIRE( region.getOffset() == 10 );
}