[Musicpd-dev-team] [PATCH 1/4] decoder: Rename all main decoder plugins functions to *decoder_plugin.

[Avuton Olrich]

---
 src/decoder/audiofile_plugin.c |    2 +-
 src/decoder/ffmpeg_plugin.c    |    2 +-
 src/decoder/modplug_plugin.c   |    2 +-
 src/decoder/wavpack_plugin.c   |    2 +-
 src/decoder_list.c             |   16 ++++++++--------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c
index 35d6ac3..f66d90d 100644
--- a/src/decoder/audiofile_plugin.c
+++ b/src/decoder/audiofile_plugin.c
@@ -212,7 +212,7 @@ static const char *const audiofile_mime_types[] = {
        NULL 
 };
 
-const struct decoder_plugin audiofilePlugin = {
+const struct decoder_plugin audiofile_decoder_plugin = {
        .name = "audiofile",
        .stream_decode = audiofile_stream_decode,
        .tag_dup = audiofile_tag_dup,
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index e262afe..285b07e 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -529,7 +529,7 @@ static const char *const ffmpeg_mime_types[] = {
        NULL
 };
 
-const struct decoder_plugin ffmpeg_plugin = {
+const struct decoder_plugin ffmpeg_decoder_plugin = {
        .name = "ffmpeg",
        .init = ffmpeg_init,
        .stream_decode = ffmpeg_decode,
diff --git a/src/decoder/modplug_plugin.c b/src/decoder/modplug_plugin.c
index 77b8465..f636f2f 100644
--- a/src/decoder/modplug_plugin.c
+++ b/src/decoder/modplug_plugin.c
@@ -207,7 +207,7 @@ static const char *const mod_suffixes[] = {
        NULL
 };
 
-const struct decoder_plugin modplug_plugin = {
+const struct decoder_plugin modplug_decoder_plugin = {
        .name = "modplug",
        .stream_decode = mod_decode,
        .tag_dup = mod_tagdup,
diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c
index e0951a7..821536f 100644
--- a/src/decoder/wavpack_plugin.c
+++ b/src/decoder/wavpack_plugin.c
@@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = {
        NULL
 };
 
-const struct decoder_plugin wavpack_plugin = {
+const struct decoder_plugin wavpack_decoder_plugin = {
        .name = "wavpack",
        .stream_decode = wavpack_streamdecode,
        .file_decode = wavpack_filedecode,
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 6e5c8cf..8d6e6c2 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -31,17 +31,17 @@ 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;
-extern const struct decoder_plugin audiofilePlugin;
+extern const struct decoder_plugin audiofile_decoder_plugin;
 extern const struct decoder_plugin mp4ff_decoder_plugin;
 extern const struct decoder_plugin faad_decoder_plugin;
 extern const struct decoder_plugin mpcdec_decoder_plugin;
-extern const struct decoder_plugin wavpack_plugin;
-extern const struct decoder_plugin modplug_plugin;
+extern const struct decoder_plugin wavpack_decoder_plugin;
+extern const struct decoder_plugin modplug_decoder_plugin;
 extern const struct decoder_plugin mikmod_decoder_plugin;
 extern const struct decoder_plugin sidplay_decoder_plugin;
 extern const struct decoder_plugin fluidsynth_decoder_plugin;
 extern const struct decoder_plugin wildmidi_decoder_plugin;
-extern const struct decoder_plugin ffmpeg_plugin;
+extern const struct decoder_plugin ffmpeg_decoder_plugin;
 
 static const struct decoder_plugin *const decoder_plugins[] = {
 #ifdef HAVE_MAD
@@ -57,7 +57,7 @@ static const struct decoder_plugin *const decoder_plugins[] = 
{
        &flac_decoder_plugin,
 #endif
 #ifdef HAVE_AUDIOFILE
-       &audiofilePlugin,
+       &audiofile_decoder_plugin,
 #endif
 #ifdef HAVE_FAAD
        &faad_decoder_plugin,
@@ -69,10 +69,10 @@ static const struct decoder_plugin *const decoder_plugins[] 
= {
        &mpcdec_decoder_plugin,
 #endif
 #ifdef HAVE_WAVPACK
-       &wavpack_plugin,
+       &wavpack_decoder_plugin,
 #endif
 #ifdef HAVE_MODPLUG
-       &modplug_plugin,
+       &modplug_decoder_plugin,
 #endif
 #ifdef ENABLE_MIKMOD_DECODER
        &mikmod_decoder_plugin,
@@ -87,7 +87,7 @@ static const struct decoder_plugin *const decoder_plugins[] = 
{
        &wildmidi_decoder_plugin,
 #endif
 #ifdef HAVE_FFMPEG
-       &ffmpeg_plugin,
+       &ffmpeg_decoder_plugin,
 #endif
 };
 
-- 
1.6.2.2


------------------------------------------------------------------------------
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team