From 72af3c0489f8bc417189b6dd48b8db4f380e4ba3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 21 Oct 2013 20:31:34 +0200 Subject: decoder_plugin: rename struct to DecoderPlugin --- src/DecoderThread.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/DecoderThread.cxx') 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(plugin); + return const_cast(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; -- cgit v1.2.3