Commit fd90db35 authored by Avuton Olrich's avatar Avuton Olrich

decoder: Rename all main decoder plugins functions to *decoder_plugin.

parent 9e93875c
...@@ -212,7 +212,7 @@ static const char *const audiofile_mime_types[] = { ...@@ -212,7 +212,7 @@ static const char *const audiofile_mime_types[] = {
NULL NULL
}; };
const struct decoder_plugin audiofilePlugin = { const struct decoder_plugin audiofile_decoder_plugin = {
.name = "audiofile", .name = "audiofile",
.stream_decode = audiofile_stream_decode, .stream_decode = audiofile_stream_decode,
.tag_dup = audiofile_tag_dup, .tag_dup = audiofile_tag_dup,
......
...@@ -529,7 +529,7 @@ static const char *const ffmpeg_mime_types[] = { ...@@ -529,7 +529,7 @@ static const char *const ffmpeg_mime_types[] = {
NULL NULL
}; };
const struct decoder_plugin ffmpeg_plugin = { const struct decoder_plugin ffmpeg_decoder_plugin = {
.name = "ffmpeg", .name = "ffmpeg",
.init = ffmpeg_init, .init = ffmpeg_init,
.stream_decode = ffmpeg_decode, .stream_decode = ffmpeg_decode,
......
...@@ -207,7 +207,7 @@ static const char *const mod_suffixes[] = { ...@@ -207,7 +207,7 @@ static const char *const mod_suffixes[] = {
NULL NULL
}; };
const struct decoder_plugin modplug_plugin = { const struct decoder_plugin modplug_decoder_plugin = {
.name = "modplug", .name = "modplug",
.stream_decode = mod_decode, .stream_decode = mod_decode,
.tag_dup = mod_tagdup, .tag_dup = mod_tagdup,
......
...@@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = { ...@@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = {
NULL NULL
}; };
const struct decoder_plugin wavpack_plugin = { const struct decoder_plugin wavpack_decoder_plugin = {
.name = "wavpack", .name = "wavpack",
.stream_decode = wavpack_streamdecode, .stream_decode = wavpack_streamdecode,
.file_decode = wavpack_filedecode, .file_decode = wavpack_filedecode,
......
...@@ -31,17 +31,17 @@ extern const struct decoder_plugin mad_decoder_plugin; ...@@ -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 vorbis_decoder_plugin;
extern const struct decoder_plugin flac_decoder_plugin; extern const struct decoder_plugin flac_decoder_plugin;
extern const struct decoder_plugin oggflac_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 mp4ff_decoder_plugin;
extern const struct decoder_plugin faad_decoder_plugin; extern const struct decoder_plugin faad_decoder_plugin;
extern const struct decoder_plugin mpcdec_decoder_plugin; extern const struct decoder_plugin mpcdec_decoder_plugin;
extern const struct decoder_plugin wavpack_plugin; extern const struct decoder_plugin wavpack_decoder_plugin;
extern const struct decoder_plugin modplug_plugin; extern const struct decoder_plugin modplug_decoder_plugin;
extern const struct decoder_plugin mikmod_decoder_plugin; extern const struct decoder_plugin mikmod_decoder_plugin;
extern const struct decoder_plugin sidplay_decoder_plugin; extern const struct decoder_plugin sidplay_decoder_plugin;
extern const struct decoder_plugin fluidsynth_decoder_plugin; extern const struct decoder_plugin fluidsynth_decoder_plugin;
extern const struct decoder_plugin wildmidi_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[] = { static const struct decoder_plugin *const decoder_plugins[] = {
#ifdef HAVE_MAD #ifdef HAVE_MAD
...@@ -57,7 +57,7 @@ static const struct decoder_plugin *const decoder_plugins[] = { ...@@ -57,7 +57,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&flac_decoder_plugin, &flac_decoder_plugin,
#endif #endif
#ifdef HAVE_AUDIOFILE #ifdef HAVE_AUDIOFILE
&audiofilePlugin, &audiofile_decoder_plugin,
#endif #endif
#ifdef HAVE_FAAD #ifdef HAVE_FAAD
&faad_decoder_plugin, &faad_decoder_plugin,
...@@ -69,10 +69,10 @@ static const struct decoder_plugin *const decoder_plugins[] = { ...@@ -69,10 +69,10 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&mpcdec_decoder_plugin, &mpcdec_decoder_plugin,
#endif #endif
#ifdef HAVE_WAVPACK #ifdef HAVE_WAVPACK
&wavpack_plugin, &wavpack_decoder_plugin,
#endif #endif
#ifdef HAVE_MODPLUG #ifdef HAVE_MODPLUG
&modplug_plugin, &modplug_decoder_plugin,
#endif #endif
#ifdef ENABLE_MIKMOD_DECODER #ifdef ENABLE_MIKMOD_DECODER
&mikmod_decoder_plugin, &mikmod_decoder_plugin,
...@@ -87,7 +87,7 @@ static const struct decoder_plugin *const decoder_plugins[] = { ...@@ -87,7 +87,7 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&wildmidi_decoder_plugin, &wildmidi_decoder_plugin,
#endif #endif
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
&ffmpeg_plugin, &ffmpeg_decoder_plugin,
#endif #endif
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment