From d1e031e8e2b02cdc9b60656241dcea56092fc8a5 Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Sun, 22 Dec 2019 18:39:05 +0100
Subject: [PATCH] Added a method to FilePromise to get a data source

---
 src/sfizz/FilePool.h | 11 +++++++++++
 src/sfizz/Voice.cpp  | 14 +++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/sfizz/FilePool.h b/src/sfizz/FilePool.h
index 9d54fd6d..679526e1 100644
--- a/src/sfizz/FilePool.h
+++ b/src/sfizz/FilePool.h
@@ -47,10 +47,21 @@ struct PreloadedFileHandle
 
 struct FilePromise
 {
+    auto getData()
+    {
+        if (dataReady)
+            return AudioSpan<const float>(*fileData);
+        else if (availableFrames > preloadedData->getNumFrames())
+            return AudioSpan<const float>(*fileData).first(availableFrames);
+        else
+            return AudioSpan<const float>(*preloadedData);
+    }
+
     absl::string_view filename {};
     AudioBufferPtr preloadedData {};
     std::unique_ptr<AudioBuffer<float>> fileData {};
     float sampleRate { config::defaultSampleRate };
+    std::atomic<int> availableFrames { 0 };
     std::atomic<bool> dataReady { false };
     Oversampling oversamplingFactor { config::defaultOversamplingFactor };
 };
diff --git a/src/sfizz/Voice.cpp b/src/sfizz/Voice.cpp
index ce0ffd1d..227dc2e3 100644
--- a/src/sfizz/Voice.cpp
+++ b/src/sfizz/Voice.cpp
@@ -374,16 +374,12 @@ void sfz::Voice::fillWithData(AudioSpan<float> buffer) noexcept
     if (buffer.getNumFrames() == 0)
         return;
 
-    auto source { [&]() {
-        // if (region->trueSampleEnd() < currentPromise->preloadedData->getNumFrames())
-        //     return AudioSpan<const float>(*currentPromise->preloadedData);
-        // else
-        if (!currentPromise->dataReady)
-            return AudioSpan<const float>(*currentPromise->preloadedData);
-        else
-            return AudioSpan<const float>(*currentPromise->fileData);
-    }() };
+    if (currentPromise == nullptr) {
+        DBG("[Voice] Missing promise during fillWithData");
+        return;
+    }
 
+    auto source = currentPromise->getData();
     auto indices = indexSpan.first(buffer.getNumFrames());
     auto jumps = tempSpan1.first(buffer.getNumFrames());
     auto bends = tempSpan2.first(buffer.getNumFrames());