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

input_plugin: rename struct to "InputPlugin"

Browse Source
This commit is contained in:
Max Kellermann 2013-10-17 10:20:57 +02:00
parent 7c1cf61728
commit 24780d99e6
23 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/InputInit.cxx
View File

@ -65,7 +65,7 @@ input_stream_global_init(Error &error)
const config_param empty; const config_param empty;
for (unsigned i = 0; input_plugins[i] != NULL; ++i) { for (unsigned i = 0; input_plugins[i] != NULL; ++i) {
const struct input_plugin *plugin = input_plugins[i]; const InputPlugin *plugin = input_plugins[i];
assert(plugin->name != NULL); assert(plugin->name != NULL);
assert(*plugin->name != 0); assert(*plugin->name != 0);

2
src/InputPlugin.hxx
View File

@ -32,7 +32,7 @@ struct input_stream;
class Error; class Error;
struct Tag; struct Tag;
struct input_plugin { struct InputPlugin {
const char *name; const char *name;
/** /**

2
src/InputRegistry.cxx
View File

@ -46,7 +46,7 @@
#include "input/DespotifyInputPlugin.hxx" #include "input/DespotifyInputPlugin.hxx"
#endif #endif
const struct input_plugin *const input_plugins[] = { const InputPlugin *const input_plugins[] = {
&input_plugin_file, &input_plugin_file,
#ifdef ENABLE_ARCHIVE #ifdef ENABLE_ARCHIVE
&input_plugin_archive, &input_plugin_archive,

4
src/InputRegistry.hxx
View File

@ -26,12 +26,12 @@
* NULL terminated list of all input plugins which were enabled at * NULL terminated list of all input plugins which were enabled at
* compile time. * compile time.
*/ */
extern const struct input_plugin *const input_plugins[]; extern const struct InputPlugin *const input_plugins[];
extern bool input_plugins_enabled[]; extern bool input_plugins_enabled[];
#define input_plugins_for_each(plugin) \ #define input_plugins_for_each(plugin) \
for (const struct input_plugin *plugin, \ for (const InputPlugin *plugin, \
*const*input_plugin_iterator = &input_plugins[0]; \ *const*input_plugin_iterator = &input_plugins[0]; \
(plugin = *input_plugin_iterator) != NULL; \ (plugin = *input_plugin_iterator) != NULL; \
++input_plugin_iterator) ++input_plugin_iterator)

5
src/InputStream.hxx
View File

@ -33,12 +33,13 @@
class Cond; class Cond;
class Error; class Error;
struct Tag; struct Tag;
struct InputPlugin;
struct input_stream { struct input_stream {
/** /**
* the plugin which implements this input stream * the plugin which implements this input stream
*/ */
const struct input_plugin &plugin; const InputPlugin &plugin;
/** /**
* The absolute URI which was used to open this stream. * The absolute URI which was used to open this stream.
@ -91,7 +92,7 @@ struct input_stream {
*/ */
std::string mime; std::string mime;
input_stream(const input_plugin &_plugin, input_stream(const InputPlugin &_plugin,
const char *_uri, Mutex &_mutex, Cond &_cond) const char *_uri, Mutex &_mutex, Cond &_cond)
:plugin(_plugin), uri(_uri), :plugin(_plugin), uri(_uri),
mutex(_mutex), cond(_cond), mutex(_mutex), cond(_cond),

4
src/archive/Bzip2ArchivePlugin.cxx
View File

@ -109,7 +109,7 @@ struct Bzip2InputStream {
void Close(); void Close();
}; };
extern const struct input_plugin bz2_inputplugin; extern const InputPlugin bz2_inputplugin;
static constexpr Domain bz2_domain("bz2"); static constexpr Domain bz2_domain("bz2");
@ -276,7 +276,7 @@ static const char *const bz2_extensions[] = {
NULL NULL
}; };
const struct input_plugin bz2_inputplugin = { const InputPlugin bz2_inputplugin = {
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,

4
src/archive/Iso9660ArchivePlugin.cxx
View File

@ -72,7 +72,7 @@ public:
Error &error) override; Error &error) override;
}; };
extern const struct input_plugin iso9660_input_plugin; extern const InputPlugin iso9660_input_plugin;
static constexpr Domain iso9660_domain("iso9660"); static constexpr Domain iso9660_domain("iso9660");
@ -239,7 +239,7 @@ static const char *const iso9660_archive_extensions[] = {
NULL NULL
}; };
const struct input_plugin iso9660_input_plugin = { const InputPlugin iso9660_input_plugin = {
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,

4
src/archive/ZzipArchivePlugin.cxx
View File

@ -66,7 +66,7 @@ public:
Error &error) override; Error &error) override;
}; };
extern const struct input_plugin zzip_input_plugin; extern const InputPlugin zzip_input_plugin;
static constexpr Domain zzip_domain("zzip"); static constexpr Domain zzip_domain("zzip");
@ -202,7 +202,7 @@ static const char *const zzip_archive_extensions[] = {
NULL NULL
}; };
const struct input_plugin zzip_input_plugin = { const InputPlugin zzip_input_plugin = {
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,

2
src/input/ArchiveInputPlugin.cxx
View File

@ -83,7 +83,7 @@ input_archive_open(const char *pathname,
return is; return is;
} }
const struct input_plugin input_plugin_archive = { const InputPlugin input_plugin_archive = {
"archive", "archive",
nullptr, nullptr,
nullptr, nullptr,

2
src/input/ArchiveInputPlugin.hxx
View File

@ -20,6 +20,6 @@
#ifndef MPD_INPUT_ARCHIVE_HXX #ifndef MPD_INPUT_ARCHIVE_HXX
#define MPD_INPUT_ARCHIVE_HXX #define MPD_INPUT_ARCHIVE_HXX
extern const struct input_plugin input_plugin_archive; extern const struct InputPlugin input_plugin_archive;
#endif #endif

2
src/input/CdioParanoiaInputPlugin.cxx
View File

@ -363,7 +363,7 @@ input_cdio_eof(struct input_stream *is)
return (cis->lsn_from + cis->lsn_relofs > cis->lsn_to); return (cis->lsn_from + cis->lsn_relofs > cis->lsn_to);
} }
const struct input_plugin input_plugin_cdio_paranoia = { const InputPlugin input_plugin_cdio_paranoia = {
"cdio_paranoia", "cdio_paranoia",
nullptr, nullptr,
nullptr, nullptr,

2
src/input/CdioParanoiaInputPlugin.hxx
View File

@ -23,6 +23,6 @@
/** /**
* An input plugin based on libcdio_paranoia library. * An input plugin based on libcdio_paranoia library.
*/ */
extern const struct input_plugin input_plugin_cdio_paranoia; extern const struct InputPlugin input_plugin_cdio_paranoia;
#endif #endif

4
src/input/CurlInputPlugin.cxx
View File

@ -551,7 +551,7 @@ CurlSockets::DispatchSockets()
} }
/* /*
* input_plugin methods * InputPlugin methods
* *
*/ */
@ -1103,7 +1103,7 @@ input_curl_open(const char *url, Mutex &mutex, Cond &cond,
return &c->base; return &c->base;
} }
const struct input_plugin input_plugin_curl = { const struct InputPlugin input_plugin_curl = {
"curl", "curl",
input_curl_init, input_curl_init,
input_curl_finish, input_curl_finish,

4
src/input/CurlInputPlugin.hxx
View File

@ -20,8 +20,6 @@
#ifndef MPD_INPUT_CURL_HXX #ifndef MPD_INPUT_CURL_HXX
#define MPD_INPUT_CURL_HXX #define MPD_INPUT_CURL_HXX
struct input_stream; extern const struct InputPlugin input_plugin_curl;
extern const struct input_plugin input_plugin_curl;
#endif #endif

2
src/input/DespotifyInputPlugin.cxx
View File

@ -219,7 +219,7 @@ input_despotify_tag(struct input_stream *is)
return tag; return tag;
} }
const struct input_plugin input_plugin_despotify = { const InputPlugin input_plugin_despotify = {
"spt", "spt",
nullptr, nullptr,
nullptr, nullptr,

2
src/input/DespotifyInputPlugin.hxx
View File

@ -20,6 +20,6 @@
#ifndef INPUT_DESPOTIFY_HXX #ifndef INPUT_DESPOTIFY_HXX
#define INPUT_DESPOTIFY_HXX #define INPUT_DESPOTIFY_HXX
extern const struct input_plugin input_plugin_despotify; extern const struct InputPlugin input_plugin_despotify;
#endif #endif

2
src/input/FfmpegInputPlugin.cxx
View File

@ -161,7 +161,7 @@ input_ffmpeg_seek(struct input_stream *is, goffset offset, int whence,
} }
} }
const struct input_plugin input_plugin_ffmpeg = { const InputPlugin input_plugin_ffmpeg = {
"ffmpeg", "ffmpeg",
input_ffmpeg_init, input_ffmpeg_init,
nullptr, nullptr,

2
src/input/FfmpegInputPlugin.hxx
View File

@ -23,6 +23,6 @@
/** /**
* An input plugin based on libavformat's "avio" library. * An input plugin based on libavformat's "avio" library.
*/ */
extern const struct input_plugin input_plugin_ffmpeg; extern const struct InputPlugin input_plugin_ffmpeg;
#endif #endif

2
src/input/FileInputPlugin.cxx
View File

@ -143,7 +143,7 @@ input_file_eof(struct input_stream *is)
return is->offset >= is->size; return is->offset >= is->size;
} }
const struct input_plugin input_plugin_file = { const InputPlugin input_plugin_file = {
"file", "file",
nullptr, nullptr,
nullptr, nullptr,

2
src/input/FileInputPlugin.hxx
View File

@ -20,6 +20,6 @@
#ifndef MPD_INPUT_FILE_HXX #ifndef MPD_INPUT_FILE_HXX
#define MPD_INPUT_FILE_HXX #define MPD_INPUT_FILE_HXX
extern const struct input_plugin input_plugin_file; extern const struct InputPlugin input_plugin_file;
#endif #endif

2
src/input/MmsInputPlugin.cxx
View File

@ -115,7 +115,7 @@ input_mms_eof(struct input_stream *is)
return m->eof; return m->eof;
} }
const struct input_plugin input_plugin_mms = { const InputPlugin input_plugin_mms = {
"mms", "mms",
nullptr, nullptr,
nullptr, nullptr,

2
src/input/MmsInputPlugin.hxx
View File

@ -20,6 +20,6 @@
#ifndef INPUT_MMS_H #ifndef INPUT_MMS_H
#define INPUT_MMS_H #define INPUT_MMS_H
extern const struct input_plugin input_plugin_mms; extern const struct InputPlugin input_plugin_mms;
#endif #endif

4
src/input/RewindInputPlugin.cxx
View File

@ -28,7 +28,7 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
extern const struct input_plugin rewind_input_plugin; extern const InputPlugin rewind_input_plugin;
struct RewindInputStream { struct RewindInputStream {
struct input_stream base; struct input_stream base;
@ -221,7 +221,7 @@ input_rewind_seek(struct input_stream *is, goffset offset, int whence,
} }
} }
const struct input_plugin rewind_input_plugin = { const InputPlugin rewind_input_plugin = {
nullptr, nullptr,
nullptr, nullptr,
nullptr, nullptr,