From f07f8f7d882757e77cf1e0829daf425dbcc15d58 Mon Sep 17 00:00:00 2001 From: Max Kellermann <max@musicpd.org> Date: Wed, 26 Jun 2019 23:13:12 +0200 Subject: [PATCH] decoder/wildmidi: add fallbacks for libwildmidi<0.4 Fix build breakage from commit ea639269d8b0ae3db06c46d546d54896a8d8c89e --- src/decoder/plugins/WildmidiDecoderPlugin.cxx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/decoder/plugins/WildmidiDecoderPlugin.cxx b/src/decoder/plugins/WildmidiDecoderPlugin.cxx index 7613344c4..bafccdf13 100644 --- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx +++ b/src/decoder/plugins/WildmidiDecoderPlugin.cxx @@ -47,12 +47,21 @@ wildmidi_init(const ConfigBlock &block) utf8.c_str())); } +#ifdef LIBWILDMIDI_VERSION + /* WildMidi_ClearError() requires libwildmidi 0.4 */ WildMidi_ClearError(); AtScopeExit() { WildMidi_ClearError(); }; +#endif if (WildMidi_Init(path.c_str(), wildmidi_audio_format.sample_rate, - 0) != 0) + 0) != 0) { +#ifdef LIBWILDMIDI_VERSION + /* WildMidi_GetError() requires libwildmidi 0.4 */ throw PluginUnavailable(WildMidi_GetError()); +#else + throw PluginUnavailable("WildMidi_Init() failed"); +#endif + } return true; }