diff --git a/src/sfizz/Logger.cpp b/src/sfizz/Logger.cpp index 75f274fe..1fb60b8d 100644 --- a/src/sfizz/Logger.cpp +++ b/src/sfizz/Logger.cpp @@ -65,7 +65,7 @@ sfz::Logger::~Logger() << prefix << "_file_log.csv"; fs::path fileLogPath{ fs::current_path() / fileLogFilename.str() }; - std::cout << "Logging file times to " << fileLogPath.filename() << '\n'; + std::cout << "Logging " << fileTimes.size() << " file times to " << fileLogPath.filename() << '\n'; std::ofstream loadLogFile { fileLogPath.native() }; loadLogFile << "WaitDuration,LoadDuration,FileSize,FileName" << '\n'; for (auto& time: fileTimes) @@ -81,7 +81,7 @@ sfz::Logger::~Logger() << prefix << "_callback_log.csv"; fs::path callbackLogPath{ fs::current_path() / callbackLogFilename.str() }; - std::cout << "Logging callback times to " << callbackLogPath.filename() << '\n'; + std::cout << "Logging " << callbackTimes.size() << " callback times to " << callbackLogPath.filename() << '\n'; std::ofstream callbackLogFile { callbackLogPath.native() }; callbackLogFile << "Dispatch,RenderMethod,Data,Amplitude,Filters,Panning,NumVoices,NumSamples" << '\n'; for (auto& time: callbackTimes) diff --git a/src/sfizz/Synth.cpp b/src/sfizz/Synth.cpp index a96cfd1a..a9eef90e 100644 --- a/src/sfizz/Synth.cpp +++ b/src/sfizz/Synth.cpp @@ -410,21 +410,22 @@ void sfz::Synth::setSampleRate(float sampleRate) noexcept void sfz::Synth::renderBlock(AudioSpan buffer) noexcept { ScopedFTZ ftz; + + + if (freeWheeling) + resources.filePool.waitForBackgroundLoading(); + + AtomicGuard callbackGuard { inCallback }; + if (!canEnterCallback) + return; + CallbackBreakdown callbackBreakdown; int numActiveVoices { 0 }; - { // Main render block ScopedLogger logger { callbackBreakdown.renderMethod }; buffer.fill(0.0f); - resources.filePool.cleanupPromises(); - if (freeWheeling) - resources.filePool.waitForBackgroundLoading(); - - AtomicGuard callbackGuard { inCallback }; - if (!canEnterCallback) - return; auto tempSpan = AudioSpan(tempBuffer).first(buffer.getNumFrames()); for (auto& voice : voices) {