Merge pull request #847 from edge-classic/miniaudio-nodes-fixes

Replace stb_vorbis with minivorbis; fix FluidLite double-free; restore SFX filters
edge-classic · Jan 17, 2025 · 3b261df · 3b261df
2 parents d357446 + 645182c
commit 3b261df
Show file tree

Hide file tree

Showing 22 changed files with 21,946 additions and 5,833 deletions.
diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(lua)
 add_subdirectory(miniz)
 add_subdirectory(pl_mpeg)
 add_subdirectory(prns)
+add_subdirectory(minivorbis)
 add_subdirectory(stb)
 if (NOT EMSCRIPTEN)
   add_subdirectory(thread)

diff --git a/libraries/fluidlite/CMakeLists.txt b/libraries/fluidlite/CMakeLists.txt
@@ -20,7 +20,7 @@ add_library(fluidlite
     src/fluid_voice.c
 )
 
-add_compile_definitions(SF3_SUPPORT=SF3_STB_VORBIS)
+add_compile_definitions(SF3_SUPPORT=SF3_XIPH_VORBIS)
 
-target_include_directories(fluidlite PRIVATE ./src ../stb)
-target_include_directories(fluidlite PUBLIC ./include)
+target_include_directories(fluidlite PRIVATE ./src ../minivorbis)
+target_include_directories(fluidlite PUBLIC ./include)
diff --git a/libraries/fluidlite/src/fluid_defsfont.c b/libraries/fluidlite/src/fluid_defsfont.c
@@ -28,9 +28,8 @@
 #include "fluid_sys.h"
 
 #if SF3_SUPPORT == SF3_XIPH_VORBIS
-#include "vorbis/codec.h"
-#include "vorbis/vorbisenc.h"
-#include "vorbis/vorbisfile.h"
+#define OV_EXCLUDE_STATIC_CALLBACKS
+#include "minivorbis.h"
 
 struct VorbisData {
     int pos;          // current position in audio->data()

diff --git a/libraries/miniaudio/miniaudio.cc b/libraries/miniaudio/miniaudio.cc
@@ -3,7 +3,7 @@
 #define MA_NO_RESOURCE_MANAGER
 #define MA_NO_WINMM
 #define MA_NO_DSOUND
-// We use our own custom stb_vorbis decoder
+// We use our own custom minivorbis decoder
 #define MA_NO_VORBIS
 #define MINIAUDIO_IMPLEMENTATION
 #include "miniaudio.h"
diff --git a/libraries/minivorbis/CMakeLists.txt b/libraries/minivorbis/CMakeLists.txt
@@ -0,0 +1,7 @@
+##########################################
+# minivorbis
+##########################################
+
+add_library(minivorbis minivorbis.c)
+
+target_include_directories(minivorbis PUBLIC ./)
diff --git a/libraries/minivorbis/minivorbis.c b/libraries/minivorbis/minivorbis.c
@@ -0,0 +1,4 @@
+#define OGG_IMPL
+#define VORBIS_IMPL
+#define OV_EXCLUDE_STATIC_CALLBACKS
+#include "minivorbis.h"