input_plugin: rename struct to "InputPlugin"

15 files changed, 17 insertions, 19 deletions

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,