[vlc-devel] [RFC 2/2] Detect fluidlite to reimplement fluidsynth

Jean-Baptiste Kempf jb at videolan.org
Mon Jun 13 15:14:25 CEST 2016


---
 configure.ac               | 2 ++
 modules/codec/fluidsynth.c | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index d04acd0..6c318ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2887,6 +2887,8 @@ dnl
 dnl libfluidsynth (MIDI synthetizer) plugin
 dnl
 PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.2], [MIDI synthetiser with libfluidsynth], [auto])
+PKG_ENABLE_MODULES_VLC([FLUIDLITE], [fluidsynth], [fluidlite], [MIDI synthetiser with libfluidsynth], [auto])
+AC_CHECK_HEADERS(fluidlite.h)
 
 dnl
 dnl Teletext Modules
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index bdc8d24..6177058 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -38,7 +38,11 @@
 # define FLUIDSYNTH_NOT_A_DLL
 #endif
 
+#ifndef HAVE_FLUIDLITE_H
 #include <fluidsynth.h>
+#else
+#include <fluidlite.h>
+#endif
 
 #define SOUNDFONT_TEXT N_("Sound fonts")
 #define SOUNDFONT_LONGTEXT N_( \
-- 
2.8.1.369.geae769a



More information about the vlc-devel mailing list