[vlc-commits] Detect fluidlite to reimplement fluidsynth

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jun 13 15:07:25 2016 +0200| [e80faf2d3bc187572b71c6b5fe6e37151322e3ef] | committer: Jean-Baptiste Kempf

Detect fluidlite to reimplement fluidsynth

FluidLite supports SF3, which is nice

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e80faf2d3bc187572b71c6b5fe6e37151322e3ef
---

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

diff --git a/configure.ac b/configure.ac
index 2df3576..50b09bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2888,6 +2888,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_( \