input/{file,archive}: remove the dummy InputPlugin instances

src/CommandLine.cxx

@@ -200,7 +200,12 @@ static void version(void)
 #endif
 
 	       "\n"
-	       "Input plugins:\n");
+	       "Input plugins:\n"
+	       " file"
+#ifdef ENABLE_ARCHIVE
+	       " archive"
+#endif
+	       );
 	input_plugins_for_each(plugin)
 		printf(" %s", plugin->name);
 

src/input/Registry.cxx

@@ -20,7 +20,6 @@
 #include "config.h"
 #include "Registry.hxx"
 #include "util/Macros.hxx"
-#include "plugins/FileInputPlugin.hxx"
 #include "plugins/TidalInputPlugin.hxx"
 #include "plugins/QobuzInputPlugin.hxx"
 
@@ -28,10 +27,6 @@
 #include "plugins/AlsaInputPlugin.hxx"
 #endif
 
-#ifdef ENABLE_ARCHIVE
-#include "plugins/ArchiveInputPlugin.hxx"
-#endif
-
 #ifdef ENABLE_CURL
 #include "plugins/CurlInputPlugin.hxx"
 #endif
@@ -57,13 +52,9 @@
 #endif
 
 const InputPlugin *const input_plugins[] = {
-	&input_plugin_file,
 #ifdef ENABLE_ALSA
 	&input_plugin_alsa,
 #endif
-#ifdef ENABLE_ARCHIVE
-	&input_plugin_archive,
-#endif
 #ifdef ENABLE_TIDAL
 	&tidal_input_plugin,
 #endif

src/input/plugins/ArchiveInputPlugin.cxx

@@ -63,19 +63,3 @@ OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond)
 	return archive_file_open(arplug, Path::FromFS(archive))
 		->OpenStream(filename, mutex, cond);
 }
-
-static InputStreamPtr
-input_archive_open(gcc_unused const char *filename,
-		   gcc_unused Mutex &mutex, gcc_unused Cond &cond)
-{
-	/* dummy method; use OpenArchiveInputStream() instead */
-
-	return nullptr;
-}
-
-const InputPlugin input_plugin_archive = {
-	"archive",
-	nullptr,
-	nullptr,
-	input_archive_open,
-};

src/input/plugins/ArchiveInputPlugin.hxx

@@ -26,8 +26,6 @@ class Path;
 class Mutex;
 class Cond;
 
-extern const struct InputPlugin input_plugin_archive;
-
 InputStreamPtr
 OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond);
 

src/input/plugins/FileInputPlugin.cxx

@@ -75,15 +75,6 @@ OpenFileInputStream(Path path,
 						 mutex, cond);
 }
 
-static InputStreamPtr
-input_file_open(gcc_unused const char *filename,
-		gcc_unused Mutex &mutex, gcc_unused Cond &cond)
-{
-	/* dummy method; use OpenFileInputStream() instead */
-
-	return nullptr;
-}
-
 void
 FileInputStream::Seek(offset_type new_offset)
 {
@@ -108,10 +99,3 @@ FileInputStream::Read(void *ptr, size_t read_size)
 	offset += nbytes;
 	return nbytes;
 }
-
-const InputPlugin input_plugin_file = {
-	"file",
-	nullptr,
-	nullptr,
-	input_file_open,
-};

src/input/plugins/FileInputPlugin.hxx

@@ -26,8 +26,6 @@ class Path;
 class Mutex;
 class Cond;
 
-extern const struct InputPlugin input_plugin_file;
-
 InputStreamPtr
 OpenFileInputStream(Path path,
 		    Mutex &mutex, Cond &cond);