aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-24 20:18:44 +0100
committerMax Kellermann <max@duempel.org>2009-01-24 20:18:44 +0100
commit2bfe6f6412f274de066105f146589d7714e4a4d6 (patch)
tree757d2d391a1ccab87609faf82b6bd0f8113f5d4c
parent5795be1f8dc72307c40bdfe6cd09665e90c34bfe (diff)
downloadmpd-2bfe6f6412f274de066105f146589d7714e4a4d6.tar.gz
mpd-2bfe6f6412f274de066105f146589d7714e4a4d6.tar.xz
mpd-2bfe6f6412f274de066105f146589d7714e4a4d6.zip
renamed the "mod" decoder plugin to "mikmod"
We have two mod plugins now: modplug and mod. Rename the latter to a more useful name.
-rw-r--r--src/Makefile.am2
-rw-r--r--src/decoder/mikmod_plugin.c (renamed from src/decoder/mod_plugin.c)4
-rw-r--r--src/decoder_list.c4
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,