update simulator third party libraries

westlicht · Nov 13, 2023 · 082bec8 · 082bec8
1 parent dac9d12
commit 082bec8
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 8 deletions.
diff --git 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
diff --git a/src/platform/sim/libs/nanovg b/src/platform/sim/libs/nanovg
diff --git a/src/platform/sim/libs/pybind11 b/src/platform/sim/libs/pybind11
diff --git a/src/platform/sim/libs/soloud b/src/platform/sim/libs/soloud
diff --git a/src/platform/sim/libs/tinyformat b/src/platform/sim/libs/tinyformat
diff --git 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
@@ -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: