diff options
| author | Max Kellermann <max@duempel.org> | 2013-10-16 23:57:26 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-10-16 23:57:26 +0200 |
| commit | d6967db761c933b55ebf48b97eab2a5ae3b1ed1c (patch) | |
| tree | 2b093ec6dcbf2b17daf201586e5a1df0b0959453 | |
| parent | b0967cae691018347dd741003b54618faf085e3c (diff) | |
| download | mpd-d6967db761c933b55ebf48b97eab2a5ae3b1ed1c.tar.gz mpd-d6967db761c933b55ebf48b97eab2a5ae3b1ed1c.tar.xz mpd-d6967db761c933b55ebf48b97eab2a5ae3b1ed1c.zip | |
decoder/wildmidi: remove suport for libwildmidi 0.2.2 or older
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/decoder/WildmidiDecoderPlugin.cxx | 4 |
3 files changed, 1 insertions, 9 deletions
@@ -102,7 +102,7 @@ For C64 SID support. libfluidsynth - http://fluidsynth.resonance.org/ For MIDI support. -libwildmidi - http://wildmidi.sourceforge.net/ +libwildmidi 0.2.3 - http://wildmidi.sourceforge.net/ For MIDI support. libsndfile - http://www.mega-nerd.com/libsndfile/ diff --git a/configure.ac b/configure.ac index 9e5f29df0..65f7fe070 100644 --- a/configure.ac +++ b/configure.ac @@ -1080,10 +1080,6 @@ if test x$enable_wildmidi = xyes; then AC_CHECK_LIB(WildMidi, WildMidi_Init,, AC_MSG_ERROR([libwildmidi not found])) - AC_CHECK_LIB(WildMidi, WildMidi_SampledSeek, - [AC_DEFINE(HAVE_WILDMIDI_SAMPLED_SEEK, 1, - [Defined if WildMidi_SampledSeek() is available (libwildmidi <= 0.2.2)])]) - CFLAGS=$oldcflags LIBS=$oldlibs CPPFLAGS=$oldcppflags diff --git a/src/decoder/WildmidiDecoderPlugin.cxx b/src/decoder/WildmidiDecoderPlugin.cxx index 1a390706f..a1d29a35e 100644 --- a/src/decoder/WildmidiDecoderPlugin.cxx +++ b/src/decoder/WildmidiDecoderPlugin.cxx @@ -106,11 +106,7 @@ wildmidi_file_decode(struct decoder *decoder, const char *path_fs) unsigned long seek_where = WILDMIDI_SAMPLE_RATE * decoder_seek_where(decoder); -#ifdef HAVE_WILDMIDI_SAMPLED_SEEK - WildMidi_SampledSeek(wm, &seek_where); -#else WildMidi_FastSeek(wm, &seek_where); -#endif decoder_command_finished(decoder); cmd = DecoderCommand::NONE; } |