From e291f3d257360667e12754154acac9ba3fe3316a Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 15 Aug 2012 00:29:38 +0200 Subject: decoder/fluidsynth: remove throttle (requires libfluidsynth 1.1) The libfluidsynth API is now sane, and does not require real-time decoding. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index f433fd08..8a0f0287 100644 --- a/configure.ac +++ b/configure.ac @@ -845,7 +845,7 @@ enable_flac_encoder=$enable_flac dnl -------------------------------- FluidSynth ------------------------------- if test x$enable_fluidsynth = xyes; then - PKG_CHECK_MODULES(FLUIDSYNTH, [fluidsynth], + PKG_CHECK_MODULES(FLUIDSYNTH, [fluidsynth >= 1.1], AC_DEFINE(ENABLE_FLUIDSYNTH, 1, [Define for fluidsynth support]), enable_fluidsynth=no) fi -- cgit v1.2.3 From 9c83464b95a6e8145fee0a03bd151f4bc7a6cac7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 15 Aug 2012 00:29:59 +0200 Subject: configure.ac: auto-detect libfluidsynth Now that the libfluidsynth API was sanitized, we can enable the plugin automatically if libfluidsynth is installed. --- INSTALL | 2 +- configure.ac | 4 ++-- src/decoder/fluidsynth_decoder_plugin.c | 9 --------- 3 files changed, 3 insertions(+), 12 deletions(-) (limited to 'configure.ac') diff --git a/INSTALL b/INSTALL index cc6fbdc3..fdebbe71 100644 --- a/INSTALL +++ b/INSTALL @@ -103,7 +103,7 @@ libsidplay2 - http://sidplay2.sourceforge.net/ For C64 SID support. libfluidsynth - http://fluidsynth.resonance.org/ -For MIDI support (DO NOT USE - use libwildmidi instead) +For MIDI support. libwildmidi - http://wildmidi.sourceforge.net/ For MIDI support. diff --git a/configure.ac b/configure.ac index 8a0f0287..f9062934 100644 --- a/configure.ac +++ b/configure.ac @@ -217,8 +217,8 @@ AC_ARG_ENABLE(flac, AC_ARG_ENABLE(fluidsynth, AS_HELP_STRING([--enable-fluidsynth], - [enable MIDI support via fluidsynth (default: disable)]),, - enable_fluidsynth=no) + [enable MIDI support via fluidsynth (default: auto)]),, + enable_fluidsynth=auto) AC_ARG_ENABLE(gme, AS_HELP_STRING([--enable-gme], diff --git a/src/decoder/fluidsynth_decoder_plugin.c b/src/decoder/fluidsynth_decoder_plugin.c index a8c148c8..1fef209b 100644 --- a/src/decoder/fluidsynth_decoder_plugin.c +++ b/src/decoder/fluidsynth_decoder_plugin.c @@ -17,15 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* - * WARNING! This plugin suffers from major shortcomings in the - * libfluidsynth API, which render it practically unusable. For a - * discussion, see the post on the fluidsynth mailing list: - * - * http://www.mail-archive.com/fluid-dev@nongnu.org/msg01099.html - * - */ - #include "config.h" #include "decoder_api.h" #include "conf.h" -- cgit v1.2.3