diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/decoder/mikmod_plugin.c (renamed from src/decoder/mod_plugin.c) | 4 | ||||
| -rw-r--r-- | src/decoder_list.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e3fac9990..7cbd3154c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -285,7 +285,7 @@ mpd_SOURCES += decoder/audiofile_plugin.c endif if HAVE_MIKMOD -mpd_SOURCES += decoder/mod_plugin.c +mpd_SOURCES += decoder/mikmod_plugin.c endif if HAVE_MODPLUG diff --git a/src/decoder/mod_plugin.c b/src/decoder/mikmod_plugin.c index b2654d111..a22fd03bf 100644 --- a/src/decoder/mod_plugin.c +++ b/src/decoder/mikmod_plugin.c @@ -247,8 +247,8 @@ static const char *const modSuffixes[] = { NULL }; -const struct decoder_plugin modPlugin = { - .name = "mod", +const struct decoder_plugin mikmod_decoder_plugin = { + .name = "mikmod", .init = mod_initMikMod, .finish = mod_finishMikMod, .file_decode = mod_decode, diff --git a/src/decoder_list.c b/src/decoder_list.c index c6f8555d4..983b794ee 100644 --- a/src/decoder_list.c +++ b/src/decoder_list.c @@ -33,7 +33,7 @@ extern const struct decoder_plugin aacPlugin; extern const struct decoder_plugin mpcPlugin; extern const struct decoder_plugin wavpack_plugin; extern const struct decoder_plugin modplug_plugin; -extern const struct decoder_plugin modPlugin; +extern const struct decoder_plugin mikmod_decoder_plugin; extern const struct decoder_plugin ffmpeg_plugin; static const struct decoder_plugin *const decoder_plugins[] = { @@ -68,7 +68,7 @@ static const struct decoder_plugin *const decoder_plugins[] = { &modplug_plugin, #endif #ifdef HAVE_MIKMOD - &modPlugin, + &mikmod_decoder_plugin, #endif #ifdef HAVE_FFMPEG &ffmpeg_plugin, |