[vlc-commits] fluidsynth: require version 1.1.x

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb  1 20:39:41 2012 +0200| [9419d728dfd004ac2a67813759b8cb9a83f44e1a] | committer: Rémi Denis-Courmont

fluidsynth: require version 1.1.x

1.0.x is full of memory leaks and race conditions, and lacks features.

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

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

diff --git a/configure.ac b/configure.ac
index 7fe4ebb..e8c5674 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2830,7 +2830,7 @@ fi
 dnl
 dnl libfluidsynth (MIDI synthetizer) plugin
 dnl
-PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth], [MIDI synthetiser with libfluidsynth], [auto])
+PKG_ENABLE_MODULES_VLC([FLUIDSYNTH], [], [fluidsynth >= 1.1.0], [MIDI synthetiser with libfluidsynth], [auto])
 
 dnl
 dnl Teletext Modules
diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index 3228555..7fabdaa 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -45,14 +45,6 @@
 
 #include <fluidsynth.h>
 
-#if (FLUIDSYNTH_VERSION_MAJOR < 1) \
- || (FLUIDSYNTH_VERSION_MAJOR == 1 && FLUIDSYNTH_VERSION_MINOR < 1)
-# define FLUID_FAILED (-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")
 #define SOUNDFONT_LONGTEXT N_( \
     "A sound fonts file is required for software synthesis." )