Store files to load and their offset and defer loading

Better behavior when using a file multiple times with different offsets.
sfztools · Jun 28, 2021 · 7d9e807 · 7d9e807
1 parent 6b1a7cd
commit 7d9e807
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp
@@ -581,6 +581,8 @@ void Synth::Impl::finalizeSfzLoad()
     size_t currentRegionIndex = 0;
     size_t currentRegionCount = layers_.size();
 
+    filesToLoad_.clear();
+
     auto removeCurrentRegion = [this, &currentRegionIndex, &currentRegionCount]() {
         const Region& region = layers_[currentRegionIndex]->getRegion();
         DBG("Removing the region with sample " << *region.sampleId);
@@ -679,10 +681,7 @@ void Synth::Impl::finalizeSfzLoad()
                 return Default::offsetMod.bounds.clamp(sumOffsetCC);
             }();
 
-            if (!filePool.preloadFile(*region.sampleId, maxOffset)) {
-                removeCurrentRegion();
-                continue;
-            }
+            filesToLoad_[*region.sampleId] = maxOffset;
         }
         else if (!region.isGenerator()) {
             if (!wavePool.createFileWave(filePool, std::string(region.sampleId->filename()))) {
@@ -763,6 +762,11 @@ void Synth::Impl::finalizeSfzLoad()
 
         ++currentRegionIndex;
     }
+
+    for (const auto& toLoad: filesToLoad_) {
+        filePool.preloadFile(toLoad.first, toLoad.second);
+    }
+
     if (currentRegionCount < layers_.size()) {
         DBG("Removing " << (layers_.size() - currentRegionCount)
             << " out of " << layers_.size() << " regions");

diff --git a/src/sfizz/SynthPrivate.h b/src/sfizz/SynthPrivate.h
@@ -290,6 +290,9 @@ struct Synth::Impl final: public Parser::Listener {
     // Singletons passed as references to the voices
     Resources resources_;
 
+    // Temporary structure to hold the files to load and their max offset
+    absl::flat_hash_map<sfz::FileId, int64_t> filesToLoad_;
+
     // Root path
     std::string rootPath_;