diff options
| author | Max Kellermann <max@musicpd.org> | 2018-08-02 20:31:22 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-08-02 20:45:14 +0200 |
| commit | ca4c81dd8463258f321415c92edf607fc81520b4 (patch) | |
| tree | 7c81c673f0696ffd106e71bc5923fc1e77736e6c | |
| parent | e9881bbfc8598111b97fecbec39ab4a1141cdc3b (diff) | |
decoder/mikmod: require at least version 3.2
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/decoder/plugins/MikmodDecoderPlugin.cxx | 11 |
3 files changed, 2 insertions, 12 deletions
@@ -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; |