diff options
55 files changed, 93 insertions, 93 deletions
diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx index 67c0e93bf..a9a4b5432 100644 --- a/src/DecoderList.cxx +++ b/src/DecoderList.cxx @@ -48,7 +48,7 @@ #include <string.h> -const struct decoder_plugin *const decoder_plugins[] = { +const struct DecoderPlugin *const decoder_plugins[] = { #ifdef HAVE_MAD &mad_decoder_plugin, #endif @@ -119,7 +119,7 @@ static constexpr unsigned num_decoder_plugins = bool decoder_plugins_enabled[num_decoder_plugins]; static unsigned -decoder_plugin_index(const struct decoder_plugin *plugin) +decoder_plugin_index(const struct DecoderPlugin *plugin) { unsigned i = 0; @@ -130,16 +130,16 @@ decoder_plugin_index(const struct decoder_plugin *plugin) } static unsigned -decoder_plugin_next_index(const struct decoder_plugin *plugin) +decoder_plugin_next_index(const struct DecoderPlugin *plugin) { return plugin == 0 ? 0 /* start with first plugin */ : decoder_plugin_index(plugin) + 1; } -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_suffix(const char *suffix, - const struct decoder_plugin *plugin) + const struct DecoderPlugin *plugin) { if (suffix == nullptr) return nullptr; @@ -155,7 +155,7 @@ decoder_plugin_from_suffix(const char *suffix, return nullptr; } -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_mime_type(const char *mimeType, unsigned int next) { static unsigned i = num_decoder_plugins; @@ -166,7 +166,7 @@ decoder_plugin_from_mime_type(const char *mimeType, unsigned int next) if (!next) i = 0; for (; decoder_plugins[i] != nullptr; ++i) { - const struct decoder_plugin *plugin = decoder_plugins[i]; + const struct DecoderPlugin *plugin = decoder_plugins[i]; if (decoder_plugins_enabled[i] && decoder_plugin_supports_mime_type(*plugin, mimeType)) { ++i; @@ -177,7 +177,7 @@ decoder_plugin_from_mime_type(const char *mimeType, unsigned int next) return nullptr; } -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_name(const char *name) { decoder_plugins_for_each_enabled(plugin) @@ -216,7 +216,7 @@ void decoder_plugin_init_all(void) struct config_param empty; for (unsigned i = 0; decoder_plugins[i] != nullptr; ++i) { - const decoder_plugin &plugin = *decoder_plugins[i]; + const DecoderPlugin &plugin = *decoder_plugins[i]; const struct config_param *param = decoder_plugin_config(plugin.name); diff --git a/src/DecoderList.hxx b/src/DecoderList.hxx index 7beed230b..c199caa4f 100644 --- a/src/DecoderList.hxx +++ b/src/DecoderList.hxx @@ -20,13 +20,13 @@ #ifndef MPD_DECODER_LIST_HXX #define MPD_DECODER_LIST_HXX -struct decoder_plugin; +struct DecoderPlugin; -extern const struct decoder_plugin *const decoder_plugins[]; +extern const struct DecoderPlugin *const decoder_plugins[]; extern bool decoder_plugins_enabled[]; #define decoder_plugins_for_each(plugin) \ - for (const struct decoder_plugin *plugin, \ + for (const struct DecoderPlugin *plugin, \ *const*decoder_plugin_iterator = &decoder_plugins[0]; \ (plugin = *decoder_plugin_iterator) != nullptr; \ ++decoder_plugin_iterator) @@ -44,14 +44,14 @@ extern bool decoder_plugins_enabled[]; * @param plugin the previous plugin, or nullptr to find the first plugin * @return a plugin, or nullptr if none matches */ -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_suffix(const char *suffix, - const struct decoder_plugin *plugin); + const struct DecoderPlugin *plugin); -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_mime_type(const char *mimeType, unsigned int next); -const struct decoder_plugin * +const struct DecoderPlugin * decoder_plugin_from_name(const char *name); /* this is where we "load" all the "plugins" ;-) */ diff --git a/src/DecoderPlugin.cxx b/src/DecoderPlugin.cxx index db5d9304f..eb83d542d 100644 --- a/src/DecoderPlugin.cxx +++ b/src/DecoderPlugin.cxx @@ -24,7 +24,7 @@ #include <assert.h> bool -decoder_plugin_supports_suffix(const decoder_plugin &plugin, +decoder_plugin_supports_suffix(const DecoderPlugin &plugin, const char *suffix) { assert(suffix != nullptr); @@ -35,7 +35,7 @@ decoder_plugin_supports_suffix(const decoder_plugin &plugin, } bool -decoder_plugin_supports_mime_type(const decoder_plugin &plugin, +decoder_plugin_supports_mime_type(const DecoderPlugin &plugin, const char *mime_type) { assert(mime_type != nullptr); diff --git a/src/DecoderPlugin.hxx b/src/DecoderPlugin.hxx index 0bfae90e1..aaf7e5152 100644 --- a/src/DecoderPlugin.hxx +++ b/src/DecoderPlugin.hxx @@ -31,7 +31,7 @@ struct tag_handler; */ struct decoder; -struct decoder_plugin { +struct DecoderPlugin { const char *name; /** @@ -111,7 +111,7 @@ struct decoder_plugin { * the plugin is not available */ static inline bool -decoder_plugin_init(const decoder_plugin &plugin, +decoder_plugin_init(const DecoderPlugin &plugin, const config_param ¶m) { return plugin.init != nullptr @@ -123,7 +123,7 @@ decoder_plugin_init(const decoder_plugin &plugin, * Deinitialize a decoder plugin which was initialized successfully. */ static inline void -decoder_plugin_finish(const decoder_plugin &plugin) +decoder_plugin_finish(const DecoderPlugin &plugin) { if (plugin.finish != nullptr) plugin.finish(); @@ -133,7 +133,7 @@ decoder_plugin_finish(const decoder_plugin &plugin) * Decode a stream. */ static inline void -decoder_plugin_stream_decode(const decoder_plugin &plugin, +decoder_plugin_stream_decode(const DecoderPlugin &plugin, struct decoder *decoder, struct input_stream *is) { plugin.stream_decode(decoder, is); @@ -143,7 +143,7 @@ decoder_plugin_stream_decode(const decoder_plugin &plugin, * Decode a file. */ static inline void -decoder_plugin_file_decode(const decoder_plugin &plugin, +decoder_plugin_file_decode(const DecoderPlugin &plugin, struct decoder *decoder, const char *path_fs) { plugin.file_decode(decoder, path_fs); @@ -153,7 +153,7 @@ decoder_plugin_file_decode(const decoder_plugin &plugin, * Read the tag of a file. */ static inline bool -decoder_plugin_scan_file(const decoder_plugin &plugin, +decoder_plugin_scan_file(const DecoderPlugin &plugin, const char *path_fs, const struct tag_handler *handler, void *handler_ctx) { @@ -166,7 +166,7 @@ decoder_plugin_scan_file(const decoder_plugin &plugin, * Read the tag of a stream. */ static inline bool -decoder_plugin_scan_stream(const decoder_plugin &plugin, +decoder_plugin_scan_stream(const DecoderPlugin &plugin, struct input_stream *is, const struct tag_handler *handler, void *handler_ctx) @@ -180,7 +180,7 @@ decoder_plugin_scan_stream(const decoder_plugin &plugin, * return "virtual" tracks in a container */ static inline char * -decoder_plugin_container_scan( const decoder_plugin &plugin, +decoder_plugin_container_scan( const DecoderPlugin &plugin, const char* pathname, const unsigned int tnum) { @@ -191,14 +191,14 @@ decoder_plugin_container_scan( const decoder_plugin &plugin, * Does the plugin announce the specified file name suffix? */ bool -decoder_plugin_supports_suffix(const decoder_plugin &plugin, +decoder_plugin_supports_suffix(const DecoderPlugin &plugin, const char *suffix); /** * Does the plugin announce the specified MIME type? */ bool -decoder_plugin_supports_mime_type(const decoder_plugin &plugin, +decoder_plugin_supports_mime_type(const DecoderPlugin &plugin, const char *mime_type); #endif diff --git a/src/DecoderPrint.cxx b/src/DecoderPrint.cxx index f9e4d1472..9845e45ed 100644 --- a/src/DecoderPrint.cxx +++ b/src/DecoderPrint.cxx @@ -27,7 +27,7 @@ static void decoder_plugin_print(Client &client, - const struct decoder_plugin *plugin) + const struct DecoderPlugin *plugin) { const char *const*p; diff --git a/src/DecoderThread.cxx b/src/DecoderThread.cxx index 551b96a13..83de64670 100644 --- a/src/DecoderThread.cxx +++ b/src/DecoderThread.cxx @@ -111,7 +111,7 @@ decoder_input_stream_open(decoder_control &dc, const char *uri) } static bool -decoder_stream_decode(const decoder_plugin &plugin, +decoder_stream_decode(const DecoderPlugin &plugin, struct decoder *decoder, struct input_stream *input_stream) { @@ -144,7 +144,7 @@ decoder_stream_decode(const decoder_plugin &plugin, } static bool -decoder_file_decode(const decoder_plugin &plugin, +decoder_file_decode(const DecoderPlugin &plugin, struct decoder *decoder, const char *path) { assert(plugin.file_decode != nullptr); @@ -176,9 +176,9 @@ decoder_file_decode(const decoder_plugin &plugin, * Hack to allow tracking const decoder plugins in a GSList. */ static inline gpointer -deconst_plugin(const struct decoder_plugin *plugin) +deconst_plugin(const struct DecoderPlugin *plugin) { - return const_cast<struct decoder_plugin *>(plugin); + return const_cast<struct DecoderPlugin *>(plugin); } /** @@ -192,7 +192,7 @@ decoder_run_stream_mime_type(struct decoder *decoder, struct input_stream *is, { assert(tried_r != nullptr); - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; unsigned int next = 0; if (is->mime.empty()) @@ -229,7 +229,7 @@ decoder_run_stream_suffix(struct decoder *decoder, struct input_stream *is, assert(tried_r != nullptr); const char *suffix = uri_get_suffix(uri); - const struct decoder_plugin *plugin = nullptr; + const struct DecoderPlugin *plugin = nullptr; if (suffix == nullptr) return false; @@ -257,7 +257,7 @@ decoder_run_stream_suffix(struct decoder *decoder, struct input_stream *is, static bool decoder_run_stream_fallback(struct decoder *decoder, struct input_stream *is) { - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; plugin = decoder_plugin_from_name("mad"); return plugin != nullptr && plugin->stream_decode != nullptr && @@ -326,7 +326,7 @@ decoder_run_file(struct decoder *decoder, const char *path_fs) { decoder_control &dc = decoder->dc; const char *suffix = uri_get_suffix(path_fs); - const struct decoder_plugin *plugin = nullptr; + const struct DecoderPlugin *plugin = nullptr; if (suffix == nullptr) return false; diff --git a/src/SongUpdate.cxx b/src/SongUpdate.cxx index 092f5112d..37591fc4d 100644 --- a/src/SongUpdate.cxx +++ b/src/SongUpdate.cxx @@ -83,7 +83,7 @@ bool Song::UpdateFile() { const char *suffix; - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; struct stat st; struct input_stream *is = nullptr; @@ -168,7 +168,7 @@ bool Song::UpdateFileInArchive() { const char *suffix; - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; assert(IsFile()); diff --git a/src/TagFile.cxx b/src/TagFile.cxx index 60ed4a117..c7ddb60cf 100644 --- a/src/TagFile.cxx +++ b/src/TagFile.cxx @@ -42,7 +42,7 @@ tag_file_scan(const char *path_fs, if (suffix == nullptr) return false; - const struct decoder_plugin *plugin = + const struct DecoderPlugin *plugin = decoder_plugin_from_suffix(suffix, nullptr); if (plugin == nullptr) return false; diff --git a/src/UpdateContainer.cxx b/src/UpdateContainer.cxx index 87cc50268..94a004f12 100644 --- a/src/UpdateContainer.cxx +++ b/src/UpdateContainer.cxx @@ -68,7 +68,7 @@ bool update_container_file(Directory &directory, const char *name, const struct stat *st, - const decoder_plugin &plugin) + const DecoderPlugin &plugin) { if (plugin.container_scan == nullptr) return false; diff --git a/src/UpdateContainer.hxx b/src/UpdateContainer.hxx index dc4ea77b0..3b54fb39f 100644 --- a/src/UpdateContainer.hxx +++ b/src/UpdateContainer.hxx @@ -25,12 +25,12 @@ #include <sys/stat.h> struct Directory; -struct decoder_plugin; +struct DecoderPlugin; bool update_container_file(Directory &directory, const char *name, const struct stat *st, - const decoder_plugin &plugin); + const DecoderPlugin &plugin); #endif diff --git a/src/UpdateSong.cxx b/src/UpdateSong.cxx index 084c57721..7b9590e50 100644 --- a/src/UpdateSong.cxx +++ b/src/UpdateSong.cxx @@ -36,7 +36,7 @@ static void update_song_file2(Directory &directory, const char *name, const struct stat *st, - const decoder_plugin &plugin) + const DecoderPlugin &plugin) { db_lock(); Song *song = directory.FindSong(name); @@ -106,7 +106,7 @@ update_song_file(Directory &directory, const char *name, const char *suffix, const struct stat *st) { - const struct decoder_plugin *plugin = + const struct DecoderPlugin *plugin = decoder_plugin_from_suffix(suffix, nullptr); if (plugin == nullptr) return false; diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx index 39dbf118b..bf9cb71e4 100644 --- a/src/decoder/AdPlugDecoderPlugin.cxx +++ b/src/decoder/AdPlugDecoderPlugin.cxx @@ -127,7 +127,7 @@ static const char *const adplug_suffixes[] = { nullptr }; -const struct decoder_plugin adplug_decoder_plugin = { +const struct DecoderPlugin adplug_decoder_plugin = { "adplug", adplug_init, nullptr, diff --git a/src/decoder/AdPlugDecoderPlugin.h b/src/decoder/AdPlugDecoderPlugin.h index 9fdf438aa..a827fdc7d 100644 --- a/src/decoder/AdPlugDecoderPlugin.h +++ b/src/decoder/AdPlugDecoderPlugin.h @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_ADPLUG_H #define MPD_DECODER_ADPLUG_H -extern const struct decoder_plugin adplug_decoder_plugin; +extern const struct DecoderPlugin adplug_decoder_plugin; #endif diff --git a/src/decoder/AudiofileDecoderPlugin.cxx b/src/decoder/AudiofileDecoderPlugin.cxx index c7b1b1016..65fb14c0f 100644 --- a/src/decoder/AudiofileDecoderPlugin.cxx +++ b/src/decoder/AudiofileDecoderPlugin.cxx @@ -253,7 +253,7 @@ static const char *const audiofile_mime_types[] = { nullptr }; -const struct decoder_plugin audiofile_decoder_plugin = { +const struct DecoderPlugin audiofile_decoder_plugin = { "audiofile", nullptr, nullptr, diff --git a/src/decoder/AudiofileDecoderPlugin.hxx b/src/decoder/AudiofileDecoderPlugin.hxx index 59c09c006..5a17281b0 100644 --- a/src/decoder/AudiofileDecoderPlugin.hxx +++ b/src/decoder/AudiofileDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_AUDIOFILE_HXX #define MPD_DECODER_AUDIOFILE_HXX -extern const struct decoder_plugin audiofile_decoder_plugin; +extern const struct DecoderPlugin audiofile_decoder_plugin; #endif diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx index 95d4c4844..f5598826b 100644 --- a/src/decoder/DsdiffDecoderPlugin.cxx +++ b/src/decoder/DsdiffDecoderPlugin.cxx @@ -514,7 +514,7 @@ static const char *const dsdiff_mime_types[] = { nullptr }; -const struct decoder_plugin dsdiff_decoder_plugin = { +const struct DecoderPlugin dsdiff_decoder_plugin = { "dsdiff", dsdiff_init, nullptr, diff --git a/src/decoder/DsdiffDecoderPlugin.hxx b/src/decoder/DsdiffDecoderPlugin.hxx index c50605457..be14fc9cd 100644 --- a/src/decoder/DsdiffDecoderPlugin.hxx +++ b/src/decoder/DsdiffDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_DSDIFF_H #define MPD_DECODER_DSDIFF_H -extern const struct decoder_plugin dsdiff_decoder_plugin; +extern const struct DecoderPlugin dsdiff_decoder_plugin; #endif diff --git a/src/decoder/DsfDecoderPlugin.cxx b/src/decoder/DsfDecoderPlugin.cxx index 95735d8c6..8aa24a1f9 100644 --- a/src/decoder/DsfDecoderPlugin.cxx +++ b/src/decoder/DsfDecoderPlugin.cxx @@ -345,7 +345,7 @@ static const char *const dsf_mime_types[] = { NULL }; -const struct decoder_plugin dsf_decoder_plugin = { +const struct DecoderPlugin dsf_decoder_plugin = { "dsf", nullptr, nullptr, diff --git a/src/decoder/DsfDecoderPlugin.hxx b/src/decoder/DsfDecoderPlugin.hxx index 749032d1f..921c94698 100644 --- a/src/decoder/DsfDecoderPlugin.hxx +++ b/src/decoder/DsfDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_DSF_H #define MPD_DECODER_DSF_H -extern const struct decoder_plugin dsf_decoder_plugin; +extern const struct DecoderPlugin dsf_decoder_plugin; #endif diff --git a/src/decoder/FaadDecoderPlugin.cxx b/src/decoder/FaadDecoderPlugin.cxx index 077b3ccf2..4056c73fa 100644 --- a/src/decoder/FaadDecoderPlugin.cxx +++ b/src/decoder/FaadDecoderPlugin.cxx @@ -481,7 +481,7 @@ static const char *const faad_mime_types[] = { "audio/aac", "audio/aacp", nullptr }; -const struct decoder_plugin faad_decoder_plugin = { +const struct DecoderPlugin faad_decoder_plugin = { "faad", nullptr, nullptr, diff --git a/src/decoder/FaadDecoderPlugin.hxx b/src/decoder/FaadDecoderPlugin.hxx index 162c155ad..817927d5e 100644 --- a/src/decoder/FaadDecoderPlugin.hxx +++ b/src/decoder/FaadDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_FAAD_DECODER_PLUGIN_HXX #define MPD_FAAD_DECODER_PLUGIN_HXX -extern const struct decoder_plugin faad_decoder_plugin; +extern const struct DecoderPlugin faad_decoder_plugin; #endif diff --git a/src/decoder/FfmpegDecoderPlugin.cxx b/src/decoder/FfmpegDecoderPlugin.cxx index a93b5cc70..f7743180b 100644 --- a/src/decoder/FfmpegDecoderPlugin.cxx +++ b/src/decoder/FfmpegDecoderPlugin.cxx @@ -667,7 +667,7 @@ static const char *const ffmpeg_mime_types[] = { nullptr }; -const struct decoder_plugin ffmpeg_decoder_plugin = { +const struct DecoderPlugin ffmpeg_decoder_plugin = { "ffmpeg", ffmpeg_init, nullptr, diff --git a/src/decoder/FfmpegDecoderPlugin.hxx b/src/decoder/FfmpegDecoderPlugin.hxx index 9a637fff0..23bf74fce 100644 --- a/src/decoder/FfmpegDecoderPlugin.hxx +++ b/src/decoder/FfmpegDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_FFMPEG_HXX #define MPD_DECODER_FFMPEG_HXX -extern const struct decoder_plugin ffmpeg_decoder_plugin; +extern const struct DecoderPlugin ffmpeg_decoder_plugin; #endif diff --git a/src/decoder/FlacDecoderPlugin.cxx b/src/decoder/FlacDecoderPlugin.cxx index 7ce44febd..ff67727b7 100644 --- a/src/decoder/FlacDecoderPlugin.cxx +++ b/src/decoder/FlacDecoderPlugin.cxx @@ -355,7 +355,7 @@ static const char *const oggflac_mime_types[] = { nullptr }; -const struct decoder_plugin oggflac_decoder_plugin = { +const struct DecoderPlugin oggflac_decoder_plugin = { "oggflac", oggflac_init, nullptr, @@ -377,7 +377,7 @@ static const char *const flac_mime_types[] = { nullptr }; -const struct decoder_plugin flac_decoder_plugin = { +const struct DecoderPlugin flac_decoder_plugin = { "flac", nullptr, nullptr, diff --git a/src/decoder/FlacDecoderPlugin.h b/src/decoder/FlacDecoderPlugin.h index c99deeef7..936423fbf 100644 --- a/src/decoder/FlacDecoderPlugin.h +++ b/src/decoder/FlacDecoderPlugin.h @@ -20,7 +20,7 @@ #ifndef MPD_DECODER_FLAC_H #define MPD_DECODER_FLAC_H -extern const struct decoder_plugin flac_decoder_plugin; -extern const struct decoder_plugin oggflac_decoder_plugin; +extern const struct DecoderPlugin flac_decoder_plugin; +extern const struct DecoderPlugin oggflac_decoder_plugin; #endif diff --git a/src/decoder/FluidsynthDecoderPlugin.cxx b/src/decoder/FluidsynthDecoderPlugin.cxx index 5b8909492..93d935c6c 100644 --- a/src/decoder/FluidsynthDecoderPlugin.cxx +++ b/src/decoder/FluidsynthDecoderPlugin.cxx @@ -210,7 +210,7 @@ static const char *const fluidsynth_suffixes[] = { nullptr }; -const struct decoder_plugin fluidsynth_decoder_plugin = { +const struct DecoderPlugin fluidsynth_decoder_plugin = { "fluidsynth", fluidsynth_init, nullptr, diff --git a/src/decoder/FluidsynthDecoderPlugin.hxx b/src/decoder/FluidsynthDecoderPlugin.hxx index 40ed7e4d8..9771898a5 100644 --- a/src/decoder/FluidsynthDecoderPlugin.hxx +++ b/src/decoder/FluidsynthDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_FLUIDSYNTH_HXX #define MPD_DECODER_FLUIDSYNTH_HXX -extern const struct decoder_plugin fluidsynth_decoder_plugin; +extern const struct DecoderPlugin fluidsynth_decoder_plugin; #endif diff --git a/src/decoder/GmeDecoderPlugin.cxx b/src/decoder/GmeDecoderPlugin.cxx index 3a68e2321..76b0eea9d 100644 --- a/src/decoder/GmeDecoderPlugin.cxx +++ b/src/decoder/GmeDecoderPlugin.cxx @@ -279,8 +279,8 @@ static const char *const gme_suffixes[] = { nullptr }; -extern const struct decoder_plugin gme_decoder_plugin; -const struct decoder_plugin gme_decoder_plugin = { +extern const struct DecoderPlugin gme_decoder_plugin; +const struct DecoderPlugin gme_decoder_plugin = { "gme", nullptr, nullptr, diff --git a/src/decoder/GmeDecoderPlugin.hxx b/src/decoder/GmeDecoderPlugin.hxx index fba735d92..e46dc766a 100644 --- a/src/decoder/GmeDecoderPlugin.hxx +++ b/src/decoder/GmeDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_GME_HXX #define MPD_DECODER_GME_HXX -extern const struct decoder_plugin gme_decoder_plugin; +extern const struct DecoderPlugin gme_decoder_plugin; #endif diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index 260ee1900..e36bfeaac 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -1171,7 +1171,7 @@ mad_decoder_scan_stream(struct input_stream *is, static const char *const mp3_suffixes[] = { "mp3", "mp2", nullptr }; static const char *const mp3_mime_types[] = { "audio/mpeg", nullptr }; -const struct decoder_plugin mad_decoder_plugin = { +const struct DecoderPlugin mad_decoder_plugin = { "mad", mp3_plugin_init, nullptr, diff --git a/src/decoder/MadDecoderPlugin.hxx b/src/decoder/MadDecoderPlugin.hxx index c7a77304c..450323670 100644 --- a/src/decoder/MadDecoderPlugin.hxx +++ b/src/decoder/MadDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_MAD_HXX #define MPD_DECODER_MAD_HXX -extern const struct decoder_plugin mad_decoder_plugin; +extern const struct DecoderPlugin mad_decoder_plugin; #endif diff --git a/src/decoder/MikmodDecoderPlugin.cxx b/src/decoder/MikmodDecoderPlugin.cxx index 2b0978d45..e2d8d76d1 100644 --- a/src/decoder/MikmodDecoderPlugin.cxx +++ b/src/decoder/MikmodDecoderPlugin.cxx @@ -234,7 +234,7 @@ static const char *const mikmod_decoder_suffixes[] = { nullptr }; -const struct decoder_plugin mikmod_decoder_plugin = { +const struct DecoderPlugin mikmod_decoder_plugin = { "mikmod", mikmod_decoder_init, mikmod_decoder_finish, diff --git a/src/decoder/MikmodDecoderPlugin.hxx b/src/decoder/MikmodDecoderPlugin.hxx index dd3b1389e..d25c5f6e7 100644 --- a/src/decoder/MikmodDecoderPlugin.hxx +++ b/src/decoder/MikmodDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_MIKMOD_HXX #define MPD_DECODER_MIKMOD_HXX -extern const struct decoder_plugin mikmod_decoder_plugin; +extern const struct DecoderPlugin mikmod_decoder_plugin; #endif diff --git a/src/decoder/ModplugDecoderPlugin.cxx b/src/decoder/ModplugDecoderPlugin.cxx index 0d79b7283..d8c911f8e 100644 --- a/src/decoder/ModplugDecoderPlugin.cxx +++ b/src/decoder/ModplugDecoderPlugin.cxx @@ -200,7 +200,7 @@ static const char *const mod_suffixes[] = { nullptr }; -const struct decoder_plugin modplug_decoder_plugin = { +const struct DecoderPlugin modplug_decoder_plugin = { "modplug", modplug_decoder_init, nullptr, diff --git a/src/decoder/ModplugDecoderPlugin.hxx b/src/decoder/ModplugDecoderPlugin.hxx index fefb02b05..4cd9f5b25 100644 --- a/src/decoder/ModplugDecoderPlugin.hxx +++ b/src/decoder/ModplugDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_MODPLUG_HXX #define MPD_DECODER_MODPLUG_HXX -extern const struct decoder_plugin modplug_decoder_plugin; +extern const struct DecoderPlugin modplug_decoder_plugin; #endif diff --git a/src/decoder/MpcdecDecoderPlugin.cxx b/src/decoder/MpcdecDecoderPlugin.cxx index dd3319831..cc16ad838 100644 --- a/src/decoder/MpcdecDecoderPlugin.cxx +++ b/src/decoder/MpcdecDecoderPlugin.cxx @@ -267,7 +267,7 @@ mpcdec_scan_stream(struct input_stream *is, static const char *const mpcdec_suffixes[] = { "mpc", nullptr }; -const struct decoder_plugin mpcdec_decoder_plugin = { +const struct DecoderPlugin mpcdec_decoder_plugin = { "mpcdec", nullptr, nullptr, diff --git a/src/decoder/MpcdecDecoderPlugin.hxx b/src/decoder/MpcdecDecoderPlugin.hxx index 7e9b51cdb..23ecc801e 100644 --- a/src/decoder/MpcdecDecoderPlugin.hxx +++ b/src/decoder/MpcdecDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_MPCDEC_HXX #define MPD_DECODER_MPCDEC_HXX -extern const struct decoder_plugin mpcdec_decoder_plugin; +extern const struct DecoderPlugin mpcdec_decoder_plugin; #endif diff --git a/src/decoder/Mpg123DecoderPlugin.cxx b/src/decoder/Mpg123DecoderPlugin.cxx index 524716d06..9aa06831f 100644 --- a/src/decoder/Mpg123DecoderPlugin.cxx +++ b/src/decoder/Mpg123DecoderPlugin.cxx @@ -241,7 +241,7 @@ static const char *const mpg123_suffixes[] = { nullptr }; -const struct decoder_plugin mpg123_decoder_plugin = { +const struct DecoderPlugin mpg123_decoder_plugin = { "mpg123", mpd_mpg123_init, mpd_mpg123_finish, diff --git a/src/decoder/Mpg123DecoderPlugin.hxx b/src/decoder/Mpg123DecoderPlugin.hxx index 273b03eaf..10f7c37f5 100644 --- a/src/decoder/Mpg123DecoderPlugin.hxx +++ b/src/decoder/Mpg123DecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_MPG123_HXX #define MPD_DECODER_MPG123_HXX -extern const struct decoder_plugin mpg123_decoder_plugin; +extern const struct DecoderPlugin mpg123_decoder_plugin; #endif diff --git a/src/decoder/OpusDecoderPlugin.cxx b/src/decoder/OpusDecoderPlugin.cxx index 96c52a083..ade611e31 100644 --- a/src/decoder/OpusDecoderPlugin.cxx +++ b/src/decoder/OpusDecoderPlugin.cxx @@ -389,7 +389,7 @@ static const char *const opus_mime_types[] = { nullptr }; -const struct decoder_plugin opus_decoder_plugin = { +const struct DecoderPlugin opus_decoder_plugin = { "opus", mpd_opus_init, nullptr, diff --git a/src/decoder/OpusDecoderPlugin.h b/src/decoder/OpusDecoderPlugin.h index c95d6ded3..263ac6e2d 100644 --- a/src/decoder/OpusDecoderPlugin.h +++ b/src/decoder/OpusDecoderPlugin.h @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_OPUS_H #define MPD_DECODER_OPUS_H -extern const struct decoder_plugin opus_decoder_plugin; +extern const struct DecoderPlugin opus_decoder_plugin; #endif diff --git a/src/decoder/PcmDecoderPlugin.cxx b/src/decoder/PcmDecoderPlugin.cxx index 874fb5b89..8cde45cd7 100644 --- a/src/decoder/PcmDecoderPlugin.cxx +++ b/src/decoder/PcmDecoderPlugin.cxx @@ -100,7 +100,7 @@ static const char *const pcm_mime_types[] = { nullptr }; -const struct decoder_plugin pcm_decoder_plugin = { +const struct DecoderPlugin pcm_decoder_plugin = { "pcm", nullptr, nullptr, diff --git a/src/decoder/PcmDecoderPlugin.hxx b/src/decoder/PcmDecoderPlugin.hxx index 2883e866e..38e4a5020 100644 --- a/src/decoder/PcmDecoderPlugin.hxx +++ b/src/decoder/PcmDecoderPlugin.hxx @@ -28,6 +28,6 @@ #ifndef MPD_DECODER_PCM_HXX #define MPD_DECODER_PCM_HXX -extern const struct decoder_plugin pcm_decoder_plugin; +extern const struct DecoderPlugin pcm_decoder_plugin; #endif diff --git a/src/decoder/SidplayDecoderPlugin.cxx b/src/decoder/SidplayDecoderPlugin.cxx index 1ee8dcc42..a31eee3a8 100644 --- a/src/decoder/SidplayDecoderPlugin.cxx +++ b/src/decoder/SidplayDecoderPlugin.cxx @@ -420,8 +420,8 @@ static const char *const sidplay_suffixes[] = { nullptr }; -extern const struct decoder_plugin sidplay_decoder_plugin; -const struct decoder_plugin sidplay_decoder_plugin = { +extern const struct DecoderPlugin sidplay_decoder_plugin; +const struct DecoderPlugin sidplay_decoder_plugin = { "sidplay", sidplay_init, sidplay_finish, diff --git a/src/decoder/SidplayDecoderPlugin.hxx b/src/decoder/SidplayDecoderPlugin.hxx index 0b96f8e3a..16544801f 100644 --- a/src/decoder/SidplayDecoderPlugin.hxx +++ b/src/decoder/SidplayDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_SIDPLAY_HXX #define MPD_DECODER_SIDPLAY_HXX -extern const struct decoder_plugin sidplay_decoder_plugin; +extern const struct DecoderPlugin sidplay_decoder_plugin; #endif diff --git a/src/decoder/SndfileDecoderPlugin.cxx b/src/decoder/SndfileDecoderPlugin.cxx index 5c7efe230..6f4c5bb33 100644 --- a/src/decoder/SndfileDecoderPlugin.cxx +++ b/src/decoder/SndfileDecoderPlugin.cxx @@ -246,7 +246,7 @@ static const char *const sndfile_mime_types[] = { nullptr }; -const struct decoder_plugin sndfile_decoder_plugin = { +const struct DecoderPlugin sndfile_decoder_plugin = { "sndfile", nullptr, nullptr, diff --git a/src/decoder/SndfileDecoderPlugin.hxx b/src/decoder/SndfileDecoderPlugin.hxx index ba60fafd0..f8aa65680 100644 --- a/src/decoder/SndfileDecoderPlugin.hxx +++ b/src/decoder/SndfileDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_SNDFILE_HXX #define MPD_DECODER_SNDFILE_HXX -extern const struct decoder_plugin sndfile_decoder_plugin; +extern const struct DecoderPlugin sndfile_decoder_plugin; #endif diff --git a/src/decoder/VorbisDecoderPlugin.cxx b/src/decoder/VorbisDecoderPlugin.cxx index 52e0609b8..a7fbb9290 100644 --- a/src/decoder/VorbisDecoderPlugin.cxx +++ b/src/decoder/VorbisDecoderPlugin.cxx @@ -338,7 +338,7 @@ static const char *const vorbis_mime_types[] = { NULL }; -const struct decoder_plugin vorbis_decoder_plugin = { +const struct DecoderPlugin vorbis_decoder_plugin = { "vorbis", nullptr, nullptr, diff --git a/src/decoder/VorbisDecoderPlugin.h b/src/decoder/VorbisDecoderPlugin.h index 618c9ffde..54953d83a 100644 --- a/src/decoder/VorbisDecoderPlugin.h +++ b/src/decoder/VorbisDecoderPlugin.h @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_VORBIS_H #define MPD_DECODER_VORBIS_H -extern const struct decoder_plugin vorbis_decoder_plugin; +extern const struct DecoderPlugin vorbis_decoder_plugin; #endif diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx index 4bdf2122a..098436c4f 100644 --- a/src/decoder/WavpackDecoderPlugin.cxx +++ b/src/decoder/WavpackDecoderPlugin.cxx @@ -585,7 +585,7 @@ static char const *const wavpack_mime_types[] = { nullptr }; -const struct decoder_plugin wavpack_decoder_plugin = { +const struct DecoderPlugin wavpack_decoder_plugin = { "wavpack", nullptr, nullptr, diff --git a/src/decoder/WavpackDecoderPlugin.hxx b/src/decoder/WavpackDecoderPlugin.hxx index 9ebe6354f..3a2d94532 100644 --- a/src/decoder/WavpackDecoderPlugin.hxx +++ b/src/decoder/WavpackDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_WAVPACK_HXX #define MPD_DECODER_WAVPACK_HXX -extern const struct decoder_plugin wavpack_decoder_plugin; +extern const struct DecoderPlugin wavpack_decoder_plugin; #endif diff --git a/src/decoder/WildmidiDecoderPlugin.cxx b/src/decoder/WildmidiDecoderPlugin.cxx index 3454d23dc..0b2ffb6c3 100644 --- a/src/decoder/WildmidiDecoderPlugin.cxx +++ b/src/decoder/WildmidiDecoderPlugin.cxx @@ -144,7 +144,7 @@ static const char *const wildmidi_suffixes[] = { nullptr }; -const struct decoder_plugin wildmidi_decoder_plugin = { +const struct DecoderPlugin wildmidi_decoder_plugin = { "wildmidi", wildmidi_init, wildmidi_finish, diff --git a/src/decoder/WildmidiDecoderPlugin.hxx b/src/decoder/WildmidiDecoderPlugin.hxx index 956b72299..a6289612e 100644 --- a/src/decoder/WildmidiDecoderPlugin.hxx +++ b/src/decoder/WildmidiDecoderPlugin.hxx @@ -20,6 +20,6 @@ #ifndef MPD_DECODER_WILDMIDI_HXX #define MPD_DECODER_WILDMIDI_HXX -extern const struct decoder_plugin wildmidi_decoder_plugin; +extern const struct DecoderPlugin wildmidi_decoder_plugin; #endif diff --git a/test/read_tags.cxx b/test/read_tags.cxx index 7b631cae5..c7756524f 100644 --- a/test/read_tags.cxx +++ b/test/read_tags.cxx @@ -145,7 +145,7 @@ static const struct tag_handler print_handler = { int main(int argc, char **argv) { const char *decoder_name, *path; - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; #ifdef HAVE_LOCALE_H /* initialize locale */ diff --git a/test/run_decoder.cxx b/test/run_decoder.cxx index 9934429fc..08f6f66b5 100644 --- a/test/run_decoder.cxx +++ b/test/run_decoder.cxx @@ -48,7 +48,7 @@ my_log_func(const gchar *log_domain, gcc_unused GLogLevelFlags log_level, struct decoder { const char *uri; - const struct decoder_plugin *plugin; + const struct DecoderPlugin *plugin; bool initialized; }; |