From ca4c81dd8463258f321415c92edf607fc81520b4 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@musicpd.org>
Date: Thu, 2 Aug 2018 20:31:22 +0200
Subject: [PATCH] decoder/mikmod: require at least version 3.2

---
 NEWS                                        |  1 +
 configure.ac                                |  2 +-
 src/decoder/plugins/MikmodDecoderPlugin.cxx | 11 -----------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/NEWS b/NEWS
index a09c1c144..18933fa41 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ ver 0.21 (not yet released)
   - gme: try loading m3u sidecar files
   - hybrid_dsd: new decoder plugin
   - mad: move "gapless_mp3_playback" setting to "decoder" block
+  - mikmod: require at least version 3.2
   - pcm: support audio/L24 (RFC 3190)
 * resampler
   - soxr: flush resampler at end of song
diff --git a/configure.ac b/configure.ac
index d2cece3a5..014f582ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -944,7 +944,7 @@ MPD_ENABLE_AUTO_PKG(mpg123, MPG123, [libmpg123],
 	[libmpg123 decoder plugin], [libmpg123 not found])
 
 dnl -------------------------------- libmikmod --------------------------------
-MPD_ENABLE_AUTO_PKG(mikmod, LIBMIKMOD, [libmikmod],
+MPD_ENABLE_AUTO_PKG(mikmod, LIBMIKMOD, [libmikmod >= 3.2],
 	[MikMod decoder plugin], [libmikmod not found])
 
 dnl -------------------------------- libmodplug -------------------------------
diff --git a/src/decoder/plugins/MikmodDecoderPlugin.cxx b/src/decoder/plugins/MikmodDecoderPlugin.cxx
index bdea1e920..6f33da442 100644
--- a/src/decoder/plugins/MikmodDecoderPlugin.cxx
+++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx
@@ -61,10 +61,7 @@ mikmod_mpd_is_present(void)
 
 static char drv_name[] = PACKAGE_NAME;
 static char drv_version[] = VERSION;
-
-#if (LIBMIKMOD_VERSION > 0x030106)
 static char drv_alias[] = PACKAGE;
-#endif
 
 static MDRIVER drv_mpd = {
 	nullptr,
@@ -72,13 +69,9 @@ static MDRIVER drv_mpd = {
 	drv_version,
 	0,
 	255,
-#if (LIBMIKMOD_VERSION > 0x030106)
 	drv_alias,
-#if (LIBMIKMOD_VERSION >= 0x030200)
 	nullptr,  /* CmdLineHelp */
-#endif
 	nullptr,  /* CommandLine */
-#endif
 	mikmod_mpd_is_present,
 	VC_SampleLoad,
 	VC_SampleUnload,
@@ -204,11 +197,7 @@ mikmod_decoder_scan_file(Path path_fs, TagHandler &handler) noexcept
 	char *title = Player_LoadTitle(path2);
 	if (title != nullptr) {
 		handler.OnTag(TAG_TITLE, title);
-#if (LIBMIKMOD_VERSION >= 0x030200)
 		MikMod_free(title);
-#else
-		free(title);
-#endif
 	}
 
 	return true;