[vlc-commits] commit: Compile time support for FluidSynth 1.0 ( Rémi Denis-Courmont )

[git at videolan.org]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Apr 17 11:21:23 2010 +0300| [5e896a268cc1c11ad1934aa70c378e0f94d12372] | committer: Rémi Denis-Courmont 

Compile time support for FluidSynth 1.0

Packagers shall be responsible for fixing FluidSynth thread-safety
issues if they choose to use this old buggy version.

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

 configure.ac               |    2 +-
 modules/codec/fluidsynth.c |    7 +++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index bf40c22..aea59d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3162,7 +3162,7 @@ fi
 dnl
 dnl libfluidsynth (MIDI synthetizer) plugin
 dnl
-PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1], [MIDI synthetiser with libfluidsynth], [auto])
+PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto])
 
 dnl
 dnl Teletext Modules
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 4fb33fc..0f25c89 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -38,6 +38,13 @@
 
 #include <fluidsynth.h>
 
+#if (FLUIDSYNTH_VERSION_MAJOR < 1) \
+ || (FLUIDSYNTH_VERSION_MAJOR == 1 && FLUIDSYNTH_VERSION_MINOR < 1)
+# define fluid_synth_sysex(synth, ptr, len, d, e, f, g) (FLUID_FAILED)
+# define fluid_synth_system_reset(synth) (FLUID_FAILED)
+# define fluid_synth_channel_pressure(synth, channel, p) (FLUID_FAILED)
+#endif
+
 #define SOUNDFONT_TEXT N_("Sound fonts (required)")
 #define SOUNDFONT_LONGTEXT N_( \
     "A sound fonts file is required for software synthesis." )