input_plugin: rename struct to "InputPlugin"

23 files changed, 31 insertions, 32 deletions

diff --git a/src/InputInit.cxx b/src/InputInit.cxx
index d39ca5325..b488e48e3 100644
--- a/src/InputInit.cxx
+++ b/src/InputInit.cxx
@@ -65,7 +65,7 @@ input_stream_global_init(Error &error)
 	const config_param empty;
 
 	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 != 0);
diff --git a/src/InputPlugin.hxx b/src/InputPlugin.hxx
index aa843d2c3..f6976bf8d 100644
--- a/src/InputPlugin.hxx
+++ b/src/InputPlugin.hxx
@@ -32,7 +32,7 @@ struct input_stream;
 class Error;
 struct Tag;
 
-struct input_plugin {
+struct InputPlugin {
 	const char *name;
 
 	/**
diff --git a/src/InputRegistry.cxx b/src/InputRegistry.cxx
index d7481ebee..aa6c06ed1 100644
--- a/src/InputRegistry.cxx
+++ b/src/InputRegistry.cxx
@@ -46,7 +46,7 @@
 #include "input/DespotifyInputPlugin.hxx"
 #endif
 
-const struct input_plugin *const input_plugins[] = {
+const InputPlugin *const input_plugins[] = {
 	&input_plugin_file,
 #ifdef ENABLE_ARCHIVE
 	&input_plugin_archive,
diff --git a/src/InputRegistry.hxx b/src/InputRegistry.hxx
index a080d108b..8bc927a7a 100644
--- a/src/InputRegistry.hxx
+++ b/src/InputRegistry.hxx
@@ -26,12 +26,12 @@
  * NULL terminated list of all input plugins which were enabled at
  * compile time.
  */
-extern const struct input_plugin *const input_plugins[];
+extern const struct InputPlugin *const input_plugins[];
 
 extern bool input_plugins_enabled[];
 
 #define input_plugins_for_each(plugin) \
-	for (const struct input_plugin *plugin, \
+	for (const InputPlugin *plugin, \
 		*const*input_plugin_iterator = &input_plugins[0]; \
 		(plugin = *input_plugin_iterator) != NULL; \
 		++input_plugin_iterator)
diff --git a/src/InputStream.hxx b/src/InputStream.hxx
index aee2bc426..51f32deec 100644
--- a/src/InputStream.hxx
+++ b/src/InputStream.hxx
@@ -33,12 +33,13 @@
 class Cond;
 class Error;
 struct Tag;
+struct InputPlugin;
 
 struct 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.
@@ -91,7 +92,7 @@ struct input_stream {
 	 */
 	std::string mime;
 
-	input_stream(const input_plugin &_plugin,
+	input_stream(const InputPlugin &_plugin,
 		     const char *_uri, Mutex &_mutex, Cond &_cond)
 		:plugin(_plugin), uri(_uri),
 		 mutex(_mutex), cond(_cond),
diff --git a/src/archive/Bzip2ArchivePlugin.cxx b/src/archive/Bzip2ArchivePlugin.cxx
index 45cdec87c..61e31a671 100644
--- a/src/archive/Bzip2ArchivePlugin.cxx
+++ b/src/archive/Bzip2ArchivePlugin.cxx
@@ -109,7 +109,7 @@ struct Bzip2InputStream {
 	void Close();
 };
 
-extern const struct input_plugin bz2_inputplugin;
+extern const InputPlugin bz2_inputplugin;
 
 static constexpr Domain bz2_domain("bz2");
 
@@ -276,7 +276,7 @@ static const char *const bz2_extensions[] = {
 	NULL
 };
 
-const struct input_plugin bz2_inputplugin = {
+const InputPlugin bz2_inputplugin = {
 	nullptr,
 	nullptr,
 	nullptr,
diff --git a/src/archive/Iso9660ArchivePlugin.cxx b/src/archive/Iso9660ArchivePlugin.cxx
index bb49f4add..4359256e5 100644
--- a/src/archive/Iso9660ArchivePlugin.cxx
+++ b/src/archive/Iso9660ArchivePlugin.cxx
@@ -72,7 +72,7 @@ public:
 					 Error &error) override;
 };
 
-extern const struct input_plugin iso9660_input_plugin;
+extern const InputPlugin iso9660_input_plugin;
 
 static constexpr Domain iso9660_domain("iso9660");
 
@@ -239,7 +239,7 @@ static const char *const iso9660_archive_extensions[] = {
 	NULL
 };
 
-const struct input_plugin iso9660_input_plugin = {
+const InputPlugin iso9660_input_plugin = {
 	nullptr,
 	nullptr,
 	nullptr,
diff --git a/src/archive/ZzipArchivePlugin.cxx b/src/archive/ZzipArchivePlugin.cxx
index de2c62b5b..ebac331b5 100644
--- a/src/archive/ZzipArchivePlugin.cxx
+++ b/src/archive/ZzipArchivePlugin.cxx
@@ -66,7 +66,7 @@ public:
 					 Error &error) override;
 };
 
-extern const struct input_plugin zzip_input_plugin;
+extern const InputPlugin zzip_input_plugin;
 
 static constexpr Domain zzip_domain("zzip");
 
@@ -202,7 +202,7 @@ static const char *const zzip_archive_extensions[] = {
 	NULL
 };
 
-const struct input_plugin zzip_input_plugin = {
+const InputPlugin zzip_input_plugin = {
 	nullptr,
 	nullptr,
 	nullptr,
diff --git a/src/input/ArchiveInputPlugin.cxx b/src/input/ArchiveInputPlugin.cxx
index 84f0ca168..39d71f740 100644
--- a/src/input/ArchiveInputPlugin.cxx
+++ b/src/input/ArchiveInputPlugin.cxx
@@ -83,7 +83,7 @@ input_archive_open(const char *pathname,
 	return is;
 }
 
-const struct input_plugin input_plugin_archive = {
+const InputPlugin input_plugin_archive = {
 	"archive",
 	nullptr,
 	nullptr,
diff --git a/src/input/ArchiveInputPlugin.hxx b/src/input/ArchiveInputPlugin.hxx
index 96fcd0dd1..9ac70b2fc 100644
--- a/src/input/ArchiveInputPlugin.hxx
+++ b/src/input/ArchiveInputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef 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
diff --git a/src/input/CdioParanoiaInputPlugin.cxx b/src/input/CdioParanoiaInputPlugin.cxx
index 344bdc975..d441ed818 100644
--- a/src/input/CdioParanoiaInputPlugin.cxx
+++ b/src/input/CdioParanoiaInputPlugin.cxx
@@ -363,7 +363,7 @@ input_cdio_eof(struct input_stream *is)
 	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",
 	nullptr,
 	nullptr,
diff --git a/src/input/CdioParanoiaInputPlugin.hxx b/src/input/CdioParanoiaInputPlugin.hxx
index 80d98b4bf..847802a48 100644
--- a/src/input/CdioParanoiaInputPlugin.hxx
+++ b/src/input/CdioParanoiaInputPlugin.hxx
@@ -23,6 +23,6 @@
 /**
  * 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
diff --git a/src/input/CurlInputPlugin.cxx b/src/input/CurlInputPlugin.cxx
index d972ff3a7..5a89fc1fd 100644
--- a/src/input/CurlInputPlugin.cxx
+++ b/src/input/CurlInputPlugin.cxx
@@ -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;
 }
 
-const struct input_plugin input_plugin_curl = {
+const struct InputPlugin input_plugin_curl = {
 	"curl",
 	input_curl_init,
 	input_curl_finish,
diff --git a/src/input/CurlInputPlugin.hxx b/src/input/CurlInputPlugin.hxx
index 20d1309d8..30e917257 100644
--- a/src/input/CurlInputPlugin.hxx
+++ b/src/input/CurlInputPlugin.hxx
@@ -20,8 +20,6 @@
 #ifndef MPD_INPUT_CURL_HXX
 #define MPD_INPUT_CURL_HXX
 
-struct input_stream;
-
-extern const struct input_plugin input_plugin_curl;
+extern const struct InputPlugin input_plugin_curl;
 
 #endif
diff --git a/src/input/DespotifyInputPlugin.cxx b/src/input/DespotifyInputPlugin.cxx
index 27c54160c..a0eaa7793 100644
--- a/src/input/DespotifyInputPlugin.cxx
+++ b/src/input/DespotifyInputPlugin.cxx
@@ -219,7 +219,7 @@ input_despotify_tag(struct input_stream *is)
 	return tag;
 }
 
-const struct input_plugin input_plugin_despotify = {
+const InputPlugin input_plugin_despotify = {
 	"spt",
 	nullptr,
 	nullptr,
diff --git a/src/input/DespotifyInputPlugin.hxx b/src/input/DespotifyInputPlugin.hxx
index 00d699408..f1911f235 100644
--- a/src/input/DespotifyInputPlugin.hxx
+++ b/src/input/DespotifyInputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef INPUT_DESPOTIFY_HXX
 #define INPUT_DESPOTIFY_HXX
 
-extern const struct input_plugin input_plugin_despotify;
+extern const struct InputPlugin input_plugin_despotify;
 
 #endif
diff --git a/src/input/FfmpegInputPlugin.cxx b/src/input/FfmpegInputPlugin.cxx
index 60562062d..e6eeaa8fc 100644
--- a/src/input/FfmpegInputPlugin.cxx
+++ b/src/input/FfmpegInputPlugin.cxx
@@ -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",
 	input_ffmpeg_init,
 	nullptr,
diff --git a/src/input/FfmpegInputPlugin.hxx b/src/input/FfmpegInputPlugin.hxx
index d5e3a8d9b..9bc2eeaea 100644
--- a/src/input/FfmpegInputPlugin.hxx
+++ b/src/input/FfmpegInputPlugin.hxx
@@ -23,6 +23,6 @@
 /**
  * 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
diff --git a/src/input/FileInputPlugin.cxx b/src/input/FileInputPlugin.cxx
index a8557fc4d..221dbff84 100644
--- a/src/input/FileInputPlugin.cxx
+++ b/src/input/FileInputPlugin.cxx
@@ -143,7 +143,7 @@ input_file_eof(struct input_stream *is)
 	return is->offset >= is->size;
 }
 
-const struct input_plugin input_plugin_file = {
+const InputPlugin input_plugin_file = {
 	"file",
 	nullptr,
 	nullptr,
diff --git a/src/input/FileInputPlugin.hxx b/src/input/FileInputPlugin.hxx
index aacfd0b5d..f76f4dd0e 100644
--- a/src/input/FileInputPlugin.hxx
+++ b/src/input/FileInputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef 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
diff --git a/src/input/MmsInputPlugin.cxx b/src/input/MmsInputPlugin.cxx
index 069857fba..04c3e86c9 100644
--- a/src/input/MmsInputPlugin.cxx
+++ b/src/input/MmsInputPlugin.cxx
@@ -115,7 +115,7 @@ input_mms_eof(struct input_stream *is)
 	return m->eof;
 }
 
-const struct input_plugin input_plugin_mms = {
+const InputPlugin input_plugin_mms = {
 	"mms",
 	nullptr,
 	nullptr,
diff --git a/src/input/MmsInputPlugin.hxx b/src/input/MmsInputPlugin.hxx
index d6aa593f2..5bf37d0dc 100644
--- a/src/input/MmsInputPlugin.hxx
+++ b/src/input/MmsInputPlugin.hxx
@@ -20,6 +20,6 @@
 #ifndef INPUT_MMS_H
 #define INPUT_MMS_H
 
-extern const struct input_plugin input_plugin_mms;
+extern const struct InputPlugin input_plugin_mms;
 
 #endif
diff --git a/src/input/RewindInputPlugin.cxx b/src/input/RewindInputPlugin.cxx
index a49cf7663..2088d8eea 100644
--- a/src/input/RewindInputPlugin.cxx
+++ b/src/input/RewindInputPlugin.cxx
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <stdio.h>
 
-extern const struct input_plugin rewind_input_plugin;
+extern const InputPlugin rewind_input_plugin;
 
 struct RewindInputStream {
 	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,