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

Store files to load and their offset and defer loading

Browse source 
Better behavior when using a file multiple times with different offsets.
This commit is contained in:
Paul Fd 2021-06-28 10:27:24 +02:00
parent 6b1a7cd259
commit da942c9244
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/sfizz/Synth.cpp
View file

@ -581,6 +581,8 @@ void Synth::Impl::finalizeSfzLoad()
size_t currentRegionIndex = 0; size_t currentRegionIndex = 0;
size_t currentRegionCount = layers_.size(); size_t currentRegionCount = layers_.size();
absl::flat_hash_map<sfz::FileId, int64_t> filesToLoad;
auto removeCurrentRegion = [this, &currentRegionIndex, &currentRegionCount]() { auto removeCurrentRegion = [this, &currentRegionIndex, &currentRegionCount]() {
const Region& region = layers_[currentRegionIndex]->getRegion(); const Region& region = layers_[currentRegionIndex]->getRegion();
DBG("Removing the region with sample " << *region.sampleId); DBG("Removing the region with sample " << *region.sampleId);
@ -679,10 +681,8 @@ void Synth::Impl::finalizeSfzLoad()
return Default::offsetMod.bounds.clamp(sumOffsetCC); return Default::offsetMod.bounds.clamp(sumOffsetCC);
}(); }();
if (!filePool.preloadFile(*region.sampleId, maxOffset)) { auto& toLoad = filesToLoad[*region.sampleId];
removeCurrentRegion(); toLoad = max(toLoad, maxOffset);
continue;
}
} }
else if (!region.isGenerator()) { else if (!region.isGenerator()) {
if (!wavePool.createFileWave(filePool, std::string(region.sampleId->filename()))) { if (!wavePool.createFileWave(filePool, std::string(region.sampleId->filename()))) {
@ -763,6 +763,11 @@ void Synth::Impl::finalizeSfzLoad()
++currentRegionIndex; ++currentRegionIndex;
} }
for (const auto& toLoad: filesToLoad) {
filePool.preloadFile(toLoad.first, toLoad.second);
}
if (currentRegionCount < layers_.size()) { if (currentRegionCount < layers_.size()) {
DBG("Removing " << (layers_.size() - currentRegionCount) DBG("Removing " << (layers_.size() - currentRegionCount)
<< " out of " << layers_.size() << " regions"); << " out of " << layers_.size() << " regions");