From 082bec87ca57055d94a49f9fac6da9d5f5f986b8 Mon Sep 17 00:00:00 2001
From: Simon Kallweit <simon.kallweit@gmail.com>
Date: Mon, 13 Nov 2023 22:59:44 +0100
Subject: [PATCH] update simulator third party libraries

---
 src/platform/sim/CMakeLists.txt                     | 1 +
 src/platform/sim/libs/args                          | 2 +-
 src/platform/sim/libs/nanovg                        | 2 +-
 src/platform/sim/libs/pybind11                      | 2 +-
 src/platform/sim/libs/soloud                        | 2 +-
 src/platform/sim/libs/tinyformat                    | 2 +-
 src/platform/sim/sim/frontend/instruments/Synth.cpp | 5 +++--
 src/platform/sim/sim/frontend/instruments/Synth.h   | 2 +-
 8 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/platform/sim/CMakeLists.txt b/src/platform/sim/CMakeLists.txt
index 6d5ce76f..35e3dce2 100644
--- a/src/platform/sim/CMakeLists.txt
+++ b/src/platform/sim/CMakeLists.txt
@@ -22,6 +22,7 @@ set(platform_linker_flags "" PARENT_SCOPE)
 
 set(platform_sources
     # soloud
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/soloud/src/audiosource/wav/dr_impl.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/soloud/src/audiosource/wav/soloud_wav.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/soloud/src/audiosource/wav/stb_vorbis.c
     ${CMAKE_CURRENT_SOURCE_DIR}/libs/soloud/src/backend/sdl2_static/soloud_sdl2_static.cpp
diff --git a/src/platform/sim/libs/args b/src/platform/sim/libs/args
index a82a9d6c..b7d67237 160000
--- a/src/platform/sim/libs/args
+++ b/src/platform/sim/libs/args
@@ -1 +1 @@
-Subproject commit a82a9d6c94d7c58d8b96c65bdc1aba09a4f3e5db
+Subproject commit b7d67237e8bdaa517d7fd6e4e84e1f6efa24f8c5
diff --git a/src/platform/sim/libs/nanovg b/src/platform/sim/libs/nanovg
index f4069e6a..f93799c0 160000
--- a/src/platform/sim/libs/nanovg
+++ b/src/platform/sim/libs/nanovg
@@ -1 +1 @@
-Subproject commit f4069e6a1ad5da430fb0a9c57476d5ddc2ff89b2
+Subproject commit f93799c078fa11ed61c078c65a53914c8782c00b
diff --git a/src/platform/sim/libs/pybind11 b/src/platform/sim/libs/pybind11
index 64205140..e250155a 160000
--- a/src/platform/sim/libs/pybind11
+++ b/src/platform/sim/libs/pybind11
@@ -1 +1 @@
-Subproject commit 64205140bdaf02be50d3476bb507e8354a512d04
+Subproject commit e250155afadde7100e627e6aa4a541137a863243
diff --git a/src/platform/sim/libs/soloud b/src/platform/sim/libs/soloud
index 7b6cb718..11574758 160000
--- a/src/platform/sim/libs/soloud
+++ b/src/platform/sim/libs/soloud
@@ -1 +1 @@
-Subproject commit 7b6cb7185d12b0d3283a9bf30e6cc3295e57a77c
+Subproject commit 1157475881da0d7f76102578255b937c7d4e8f57
diff --git a/src/platform/sim/libs/tinyformat b/src/platform/sim/libs/tinyformat
index 33d61f30..aef402d8 160000
--- a/src/platform/sim/libs/tinyformat
+++ b/src/platform/sim/libs/tinyformat
@@ -1 +1 @@
-Subproject commit 33d61f30f7c11dab2e4ed29e52e5e1cec0572feb
+Subproject commit aef402d85c1e8f9bf491b72570bfe8938ae26727
diff --git a/src/platform/sim/sim/frontend/instruments/Synth.cpp b/src/platform/sim/sim/frontend/instruments/Synth.cpp
index 14123cc5..4f3065a8 100644
--- a/src/platform/sim/sim/frontend/instruments/Synth.cpp
+++ b/src/platform/sim/sim/frontend/instruments/Synth.cpp
@@ -280,14 +280,15 @@ SynthInstance::SynthInstance(Synth &synth) :
 SynthInstance::~SynthInstance() {
 }
 
-void SynthInstance::getAudio(float *aBuffer, unsigned int aSamples) {
-    for (size_t i = 0; i < aSamples; ++i) {
+unsigned int SynthInstance::getAudio(float *aBuffer, unsigned int aSamplesToRead, unsigned int aBufferSize) {
+    for (size_t i = 0; i < aSamplesToRead; ++i) {
         if (i % 128 == 0) {
             _voice->setGate(_synth._gate);
             _voice->setCv(_synth._cv);
         }
         aBuffer[i] = _voice->process();
     }
+    return aSamplesToRead;
 }
 
 bool SynthInstance::hasEnded() {
diff --git a/src/platform/sim/sim/frontend/instruments/Synth.h b/src/platform/sim/sim/frontend/instruments/Synth.h
index 0fe9935d..c5a39c56 100644
--- a/src/platform/sim/sim/frontend/instruments/Synth.h
+++ b/src/platform/sim/sim/frontend/instruments/Synth.h
@@ -15,7 +15,7 @@ class SynthInstance : public SoLoud::AudioSourceInstance {
     SynthInstance(Synth &synth);
     virtual ~SynthInstance();
 
-    virtual void getAudio(float *aBuffer, unsigned int aSamples) override;
+    virtual unsigned int getAudio(float *aBuffer, unsigned int aSamplesToRead, unsigned int aBufferSize) override;
     virtual bool hasEnded() override;
 
 private: