decoder/wildmidi: support version 0.2.3

In libwildmidi 0.2.3, the function WildMidi_SampledSeek() was removed, without changing the SO name. This patch adds an autoconf check for that function. Fall back to WildMidi_FastSeek() if WildMidi_SampledSeek() is not available anymore.

decoder/wildmidi: support version 0.2.3
898a13f1 · Max Kellermann · b97e9246 · 898a13f1 · 898a13f1 · 898a13f1
Commit 898a13f1 authored Jul 20, 2010 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

NEWS NEWS +2 -0

configure.ac configure.ac +4 -0

wildmidi_plugin.c src/decoder/wildmidi_plugin.c +4 -0

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.15.12 (2010/??/??)
+* decoders:
+  - wildmidi: support version 0.2.3


 ver 0.15.11 (2010/06/14)

--- a/configure.ac
+++ b/configure.ac
@@ -950,6 +950,10 @@ 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

--- a/src/decoder/wildmidi_plugin.c
+++ b/src/decoder/wildmidi_plugin.c
@@ -99,7 +99,11 @@ 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 = DECODE_COMMAND_NONE;
 		}