From 0b614fbaae9089d6d1ce981735a51f2a5b3cbf65 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 1 Nov 2008 14:54:09 +0100 Subject: decoder: make all decoder_plugin structs const All decoder_plugin structs are initialized at compile time, and must never change. --- src/decoder/aac_plugin.c | 2 +- src/decoder/audiofile_plugin.c | 2 +- src/decoder/ffmpeg_plugin.c | 2 +- src/decoder/flac_plugin.c | 4 ++-- src/decoder/mod_plugin.c | 2 +- src/decoder/mp3_plugin.c | 2 +- src/decoder/mp4_plugin.c | 2 +- src/decoder/mpc_plugin.c | 2 +- src/decoder/oggflac_plugin.c | 2 +- src/decoder/oggvorbis_plugin.c | 2 +- src/decoder/wavpack_plugin.c | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/decoder') diff --git a/src/decoder/aac_plugin.c b/src/decoder/aac_plugin.c index 7e6b8c91..3ae5e3d5 100644 --- a/src/decoder/aac_plugin.c +++ b/src/decoder/aac_plugin.c @@ -589,7 +589,7 @@ static struct tag *aacTagDup(const char *file) static const char *aac_suffixes[] = { "aac", NULL }; static const char *aac_mimeTypes[] = { "audio/aac", "audio/aacp", NULL }; -struct decoder_plugin aacPlugin = { +const struct decoder_plugin aacPlugin = { .name = "aac", .stream_decode = aac_stream_decode, .file_decode = aac_decode, diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c index 8f493d1e..9cc87a10 100644 --- a/src/decoder/audiofile_plugin.c +++ b/src/decoder/audiofile_plugin.c @@ -135,7 +135,7 @@ static struct tag *audiofileTagDup(const char *file) static const char *audiofileSuffixes[] = { "wav", "au", "aiff", "aif", NULL }; -struct decoder_plugin audiofilePlugin = { +const struct decoder_plugin audiofilePlugin = { .name = "audiofile", .file_decode = audiofile_decode, .tag_dup = audiofileTagDup, diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c index a249bc11..e5bd8515 100644 --- a/src/decoder/ffmpeg_plugin.c +++ b/src/decoder/ffmpeg_plugin.c @@ -380,7 +380,7 @@ static const char *ffmpeg_Mimetypes[] = { NULL }; -struct decoder_plugin ffmpegPlugin = { +const struct decoder_plugin ffmpegPlugin = { .name = "ffmpeg", .init = ffmpeg_init, .try_decode = ffmpeg_try_decode, diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c index 0c486942..8b49ec3e 100644 --- a/src/decoder/flac_plugin.c +++ b/src/decoder/flac_plugin.c @@ -435,7 +435,7 @@ static const char *oggflac_mime_types[] = { "audio/x-flac+ogg", "application/x-ogg", NULL }; -struct decoder_plugin oggflacPlugin = { +const struct decoder_plugin oggflacPlugin = { .name = "oggflac", .try_decode = oggflac_try_decode, .stream_decode = oggflac_decode, @@ -452,7 +452,7 @@ static const char *flac_mime_types[] = { "audio/x-flac", "application/x-flac", NULL }; -struct decoder_plugin flacPlugin = { +const struct decoder_plugin flacPlugin = { .name = "flac", .stream_decode = flac_decode, .tag_dup = flacTagDup, diff --git a/src/decoder/mod_plugin.c b/src/decoder/mod_plugin.c index 8a45db84..ad6f390a 100644 --- a/src/decoder/mod_plugin.c +++ b/src/decoder/mod_plugin.c @@ -281,7 +281,7 @@ static const char *modSuffixes[] = { "amf", NULL }; -struct decoder_plugin modPlugin = { +const struct decoder_plugin modPlugin = { .name = "mod", .finish = mod_finishMikMod, .file_decode = mod_decode, diff --git a/src/decoder/mp3_plugin.c b/src/decoder/mp3_plugin.c index fe15568f..1dc47b45 100644 --- a/src/decoder/mp3_plugin.c +++ b/src/decoder/mp3_plugin.c @@ -1146,7 +1146,7 @@ static struct tag *mp3_tag_dup(const char *file) static const char *mp3_suffixes[] = { "mp3", "mp2", NULL }; static const char *mp3_mime_types[] = { "audio/mpeg", NULL }; -struct decoder_plugin mp3Plugin = { +const struct decoder_plugin mp3Plugin = { .name = "mp3", .init = mp3_plugin_init, .stream_decode = mp3_decode, diff --git a/src/decoder/mp4_plugin.c b/src/decoder/mp4_plugin.c index 8fe2b18f..ae0fe49f 100644 --- a/src/decoder/mp4_plugin.c +++ b/src/decoder/mp4_plugin.c @@ -413,7 +413,7 @@ static struct tag *mp4TagDup(const char *file) static const char *mp4_suffixes[] = { "m4a", "mp4", NULL }; static const char *mp4_mimeTypes[] = { "audio/mp4", "audio/m4a", NULL }; -struct decoder_plugin mp4Plugin = { +const struct decoder_plugin mp4Plugin = { .name = "mp4", .stream_decode = mp4_decode, .tag_dup = mp4TagDup, diff --git a/src/decoder/mpc_plugin.c b/src/decoder/mpc_plugin.c index 137c01af..73b31572 100644 --- a/src/decoder/mpc_plugin.c +++ b/src/decoder/mpc_plugin.c @@ -297,7 +297,7 @@ static struct tag *mpcTagDup(const char *file) static const char *mpcSuffixes[] = { "mpc", NULL }; -struct decoder_plugin mpcPlugin = { +const struct decoder_plugin mpcPlugin = { .name = "mpc", .stream_decode = mpc_decode, .tag_dup = mpcTagDup, diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_plugin.c index 769259ee..9fa74254 100644 --- a/src/decoder/oggflac_plugin.c +++ b/src/decoder/oggflac_plugin.c @@ -343,7 +343,7 @@ static const char *oggflac_mime_types[] = { "audio/x-flac+ogg", "application/x-ogg", NULL }; -struct decoder_plugin oggflacPlugin = { +const struct decoder_plugin oggflacPlugin = { .name = "oggflac", .try_decode = oggflac_try_decode, .stream_decode = oggflac_decode, diff --git a/src/decoder/oggvorbis_plugin.c b/src/decoder/oggvorbis_plugin.c index be6664b8..4531aac4 100644 --- a/src/decoder/oggvorbis_plugin.c +++ b/src/decoder/oggvorbis_plugin.c @@ -374,7 +374,7 @@ static const char *oggvorbis_MimeTypes[] = { "application/ogg", "application/x-ogg", NULL }; -struct decoder_plugin oggvorbisPlugin = { +const struct decoder_plugin oggvorbisPlugin = { .name = "oggvorbis", .try_decode = oggvorbis_try_decode, .stream_decode = oggvorbis_decode, diff --git a/src/decoder/wavpack_plugin.c b/src/decoder/wavpack_plugin.c index 420edade..c0fb8898 100644 --- a/src/decoder/wavpack_plugin.c +++ b/src/decoder/wavpack_plugin.c @@ -562,7 +562,7 @@ wavpack_filedecode(struct decoder *decoder, const char *fname) static char const *wavpackSuffixes[] = { "wv", NULL }; static char const *wavpackMimeTypes[] = { "audio/x-wavpack", NULL }; -struct decoder_plugin wavpackPlugin = { +const struct decoder_plugin wavpackPlugin = { .name = "wavpack", .try_decode = wavpack_trydecode, .stream_decode = wavpack_streamdecode, -- cgit v1.2.3