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

Cleaned up the voice source fetching

Browse source
This commit is contained in:
paulfd 2019-09-16 16:03:22 +02:00
parent 49bf4c229f
commit a37e0fd71c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sfizz/Voice.cpp
View file

@ -344,7 +344,9 @@ void sfz::Voice::processStereo(AudioSpan<float> buffer) noexcept
void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
{ {
auto source { [&]() { auto source { [&]() {
if (region->canUsePreloadedData() || !dataReady) if (region->canUsePreloadedData())
return AudioSpan<const float>(*region->preloadedData);
else if (!dataReady)
return AudioSpan<const float>(*region->preloadedData); return AudioSpan<const float>(*region->preloadedData);
else else
return AudioSpan<const float>(*fileData); return AudioSpan<const float>(*fileData);
@ -483,8 +485,9 @@ void sfz::Voice::reset() noexcept
void sfz::Voice::garbageCollect() noexcept void sfz::Voice::garbageCollect() noexcept
{ {
if (state == State::idle && region == nullptr) if (state == State::idle && region == nullptr) {
fileData.reset(); fileData.reset();
}
} }
void sfz::Voice::expectFileData(unsigned ticket) void sfz::Voice::expectFileData(unsigned ticket)