Merge remote-tracking branch 'upstream/main'

LabSound · Jan 26, 2024 · 98abe8d · 98abe8d
2 parents 4dc9b78 + 21e4e5f
commit 98abe8d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/examples/src/Examples.hpp b/examples/src/Examples.hpp
@@ -1741,6 +1741,9 @@ struct ex_waveshaper : public labsound_example
             waveshaper->setCurve(curve);
             Wait(delay_time_ms);
         }
-
+
+        // ensure the waveshaper node is not being processed before deleting it
+        ac.disconnect(ac.destinationNode());
+        ac.synchronizeConnections();
     }
 };
diff --git a/examples/src/ExamplesMain.cpp b/examples/src/ExamplesMain.cpp
@@ -49,8 +49,8 @@ int main(int argc, char *argv[]) try
         { Passing::pass, Skip::yes, new ex_microphone_loopback(context, UseInput) },
         { Passing::pass, Skip::yes, new ex_microphone_reverb(context, UseInput) },
         { Passing::pass, Skip::yes, new ex_peak_compressor(context, NoInput) },
-        { Passing::pass, Skip::no,  new ex_stereo_panning(context, NoInput) },
-        { Passing::pass, Skip::yes, new ex_hrtf_spatialization(context, NoInput) },
+        { Passing::pass, Skip::yes, new ex_stereo_panning(context, NoInput) },
+        { Passing::pass, Skip::no,  new ex_hrtf_spatialization(context, NoInput) },
         { Passing::pass, Skip::yes, new ex_convolution_reverb(context, NoInput) }, // note: exhibits severe popping
         { Passing::pass, Skip::yes, new ex_misc(context, NoInput) },
         { Passing::pass, Skip::yes, new ex_dalek_filter(context, NoInput) },
@@ -59,7 +59,7 @@ int main(int argc, char *argv[]) try
         { Passing::pass, Skip::yes, new ex_granulation_node(context, NoInput) }, // note: node is under development
         { Passing::pass, Skip::yes, new ex_poly_blep(context, NoInput) },
         { Passing::fail, Skip::yes, new ex_split_merge(context, NoInput) },
-        { Passing::fail, Skip::no,  new ex_waveshaper(context, NoInput)},
+        { Passing::fail, Skip::yes,  new ex_waveshaper(context, NoInput)},
     };
 
     static constexpr int iterations = 1;

diff --git a/src/internal/src/libSampleRate.c b/src/internal/src/libSampleRate.c
@@ -2,6 +2,9 @@
 #include <stdbool.h>
 #define PACKAGE "ls-lsr"
 #define VERSION "1.0"
+#define ENABLE_SINC_BEST_CONVERTER
+#define ENABLE_SINC_MEDIUM_CONVERTER
+#define ENABLE_SINC_FAST_CONVERTER
 #include "libsamplerate/src/samplerate.c"
 #include "libsamplerate/src/src_linear.c"
 #include "libsamplerate/src/src_sinc.c"