oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder_plugin: rename struct to DecoderPlugin

This commit is contained in:
Max Kellermann 2013-10-21 20:31:34 +02:00
parent 65e54f6ed1
commit 72af3c0489
55 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/DecoderList.cxx
View File

@ -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);

14
src/DecoderList.hxx
View File

@ -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" ;-) */

4
src/DecoderPlugin.cxx
View File

@ -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);

20
src/DecoderPlugin.hxx
View File

@ -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 &param)
{
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

2
src/DecoderPrint.cxx
View File

@ -27,7 +27,7 @@
static void
decoder_plugin_print(Client &client,
const struct decoder_plugin *plugin)
const struct DecoderPlugin *plugin)
{
const char *const*p;

16
src/DecoderThread.cxx
View File

@ -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;

4
src/SongUpdate.cxx
View File

@ -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());

2
src/TagFile.cxx
View File

@ -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;

2
src/UpdateContainer.cxx
View File

@ -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;

4
src/UpdateContainer.hxx
View File

@ -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

4
src/UpdateSong.cxx
View File

@ -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;

2
src/decoder/AdPlugDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/AdPlugDecoderPlugin.h
View File

@ -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

2
src/decoder/AudiofileDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/AudiofileDecoderPlugin.hxx
View File

@ -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

2
src/decoder/DsdiffDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/DsdiffDecoderPlugin.hxx
View File

@ -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

2
src/decoder/DsfDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/DsfDecoderPlugin.hxx
View File

@ -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

2
src/decoder/FaadDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/FaadDecoderPlugin.hxx
View File

@ -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

2
src/decoder/FfmpegDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/FfmpegDecoderPlugin.hxx
View File

@ -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

4
src/decoder/FlacDecoderPlugin.cxx
View File

@ -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,

4
src/decoder/FlacDecoderPlugin.h
View File

@ -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

2
src/decoder/FluidsynthDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/FluidsynthDecoderPlugin.hxx
View File

@ -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

4
src/decoder/GmeDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/GmeDecoderPlugin.hxx
View File

@ -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

2
src/decoder/MadDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/MadDecoderPlugin.hxx
View File

@ -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

2
src/decoder/MikmodDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/MikmodDecoderPlugin.hxx
View File

@ -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

2
src/decoder/ModplugDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/ModplugDecoderPlugin.hxx
View File

@ -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

2
src/decoder/MpcdecDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/MpcdecDecoderPlugin.hxx
View File

@ -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

2
src/decoder/Mpg123DecoderPlugin.cxx
View File

@ -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,

2
src/decoder/Mpg123DecoderPlugin.hxx
View File

@ -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

2
src/decoder/OpusDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/OpusDecoderPlugin.h
View File

@ -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

2
src/decoder/PcmDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/PcmDecoderPlugin.hxx
View File

@ -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

4
src/decoder/SidplayDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/SidplayDecoderPlugin.hxx
View File

@ -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

2
src/decoder/SndfileDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/SndfileDecoderPlugin.hxx
View File

@ -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

2
src/decoder/VorbisDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/VorbisDecoderPlugin.h
View File

@ -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

2
src/decoder/WavpackDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/WavpackDecoderPlugin.hxx
View File

@ -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

2
src/decoder/WildmidiDecoderPlugin.cxx
View File

@ -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,

2
src/decoder/WildmidiDecoderPlugin.hxx
View File

@ -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

2
test/read_tags.cxx
View File

@ -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 */

2
test/run_decoder.cxx
View File

@ -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;
};