oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/wildmidi: remove suport for libwildmidi 0.2.2 or older

Browse Source
This commit is contained in:
Max Kellermann 2013-10-16 23:57:26 +02:00
parent b0967cae69
commit d6967db761
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -102,7 +102,7 @@ For C64 SID support.
libfluidsynth - http://fluidsynth.resonance.org/ libfluidsynth - http://fluidsynth.resonance.org/
For MIDI support. For MIDI support.
libwildmidi - http://wildmidi.sourceforge.net/ libwildmidi 0.2.3 - http://wildmidi.sourceforge.net/
For MIDI support. For MIDI support.
libsndfile - http://www.mega-nerd.com/libsndfile/ libsndfile - http://www.mega-nerd.com/libsndfile/

4
configure.ac
View File

@ -1080,10 +1080,6 @@ if test x$enable_wildmidi = xyes; then
AC_CHECK_LIB(WildMidi, WildMidi_Init,, AC_CHECK_LIB(WildMidi, WildMidi_Init,,
AC_MSG_ERROR([libwildmidi not found])) 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 CFLAGS=$oldcflags
LIBS=$oldlibs LIBS=$oldlibs
CPPFLAGS=$oldcppflags CPPFLAGS=$oldcppflags

4
src/decoder/WildmidiDecoderPlugin.cxx
View File

@ -106,11 +106,7 @@ wildmidi_file_decode(struct decoder *decoder, const char *path_fs)
unsigned long seek_where = WILDMIDI_SAMPLE_RATE * unsigned long seek_where = WILDMIDI_SAMPLE_RATE *
decoder_seek_where(decoder); decoder_seek_where(decoder);
#ifdef HAVE_WILDMIDI_SAMPLED_SEEK
WildMidi_SampledSeek(wm, &seek_where);
#else
WildMidi_FastSeek(wm, &seek_where); WildMidi_FastSeek(wm, &seek_where);
#endif
decoder_command_finished(decoder); decoder_command_finished(decoder);
cmd = DecoderCommand::NONE; cmd = DecoderCommand::NONE;
} }