From c5edb53797fb15b4753688b1a653bdfda53f25aa Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Mon, 16 Feb 2009 19:30:45 +0100
Subject: [PATCH] renamed decoder plugin "mp3" to "mad"

A decoder plugin should be named after the library which is used.
---
 src/Makefile.am                            | 2 +-
 src/decoder/{mp3_plugin.c => mad_plugin.c} | 4 ++--
 src/decoder_list.c                         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/decoder/{mp3_plugin.c => mad_plugin.c} (99%)

diff --git a/src/Makefile.am b/src/Makefile.am
index 1db8e1fe5..f3d9e40cf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -267,7 +267,7 @@ endif
 # decoder plugins
 
 if HAVE_MAD
-mpd_SOURCES += decoder/mp3_plugin.c
+mpd_SOURCES += decoder/mad_plugin.c
 endif
 
 if HAVE_MPCDEC
diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mad_plugin.c
similarity index 99%
rename from src/decoder/mp3_plugin.c
rename to src/decoder/mad_plugin.c
index 9956435c9..71d72bd12 100644
--- a/src/decoder/mp3_plugin.c
+++ b/src/decoder/mad_plugin.c
@@ -1208,8 +1208,8 @@ static struct tag *mp3_tag_dup(const char *file)
 static const char *const mp3_suffixes[] = { "mp3", "mp2", NULL };
 static const char *const mp3_mime_types[] = { "audio/mpeg", NULL };
 
-const struct decoder_plugin mp3Plugin = {
-	.name = "mp3",
+const struct decoder_plugin mad_decoder_plugin = {
+	.name = "mad",
 	.init = mp3_plugin_init,
 	.stream_decode = mp3_decode,
 	.tag_dup = mp3_tag_dup,
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 34dc779c5..b6093a9bc 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -26,7 +26,7 @@
 
 #include <string.h>
 
-extern const struct decoder_plugin mp3Plugin;
+extern const struct decoder_plugin mad_decoder_plugin;
 extern const struct decoder_plugin vorbis_decoder_plugin;
 extern const struct decoder_plugin flac_decoder_plugin;
 extern const struct decoder_plugin oggflac_decoder_plugin;
@@ -44,7 +44,7 @@ extern const struct decoder_plugin ffmpeg_plugin;
 
 static const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_MAD
-	&mp3Plugin,
+	&mad_decoder_plugin,
 #endif
 #ifdef HAVE_OGGVORBIS
 	&vorbis_decoder_plugin,