input/{file,archive}: remove the dummy InputPlugin instances
These have no use, exception for creating an artificial dependency from input_plugins[] to all archive plugins.
This commit is contained in:
@@ -200,7 +200,12 @@ static void version(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
"\n"
|
"\n"
|
||||||
"Input plugins:\n");
|
"Input plugins:\n"
|
||||||
|
" file"
|
||||||
|
#ifdef ENABLE_ARCHIVE
|
||||||
|
" archive"
|
||||||
|
#endif
|
||||||
|
);
|
||||||
input_plugins_for_each(plugin)
|
input_plugins_for_each(plugin)
|
||||||
printf(" %s", plugin->name);
|
printf(" %s", plugin->name);
|
||||||
|
|
||||||
|
@@ -20,7 +20,6 @@
|
|||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include "Registry.hxx"
|
#include "Registry.hxx"
|
||||||
#include "util/Macros.hxx"
|
#include "util/Macros.hxx"
|
||||||
#include "plugins/FileInputPlugin.hxx"
|
|
||||||
#include "plugins/TidalInputPlugin.hxx"
|
#include "plugins/TidalInputPlugin.hxx"
|
||||||
#include "plugins/QobuzInputPlugin.hxx"
|
#include "plugins/QobuzInputPlugin.hxx"
|
||||||
|
|
||||||
@@ -28,10 +27,6 @@
|
|||||||
#include "plugins/AlsaInputPlugin.hxx"
|
#include "plugins/AlsaInputPlugin.hxx"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef ENABLE_ARCHIVE
|
|
||||||
#include "plugins/ArchiveInputPlugin.hxx"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ENABLE_CURL
|
#ifdef ENABLE_CURL
|
||||||
#include "plugins/CurlInputPlugin.hxx"
|
#include "plugins/CurlInputPlugin.hxx"
|
||||||
#endif
|
#endif
|
||||||
@@ -57,13 +52,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
const InputPlugin *const input_plugins[] = {
|
const InputPlugin *const input_plugins[] = {
|
||||||
&input_plugin_file,
|
|
||||||
#ifdef ENABLE_ALSA
|
#ifdef ENABLE_ALSA
|
||||||
&input_plugin_alsa,
|
&input_plugin_alsa,
|
||||||
#endif
|
#endif
|
||||||
#ifdef ENABLE_ARCHIVE
|
|
||||||
&input_plugin_archive,
|
|
||||||
#endif
|
|
||||||
#ifdef ENABLE_TIDAL
|
#ifdef ENABLE_TIDAL
|
||||||
&tidal_input_plugin,
|
&tidal_input_plugin,
|
||||||
#endif
|
#endif
|
||||||
|
@@ -63,19 +63,3 @@ OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond)
|
|||||||
return archive_file_open(arplug, Path::FromFS(archive))
|
return archive_file_open(arplug, Path::FromFS(archive))
|
||||||
->OpenStream(filename, mutex, cond);
|
->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,
|
|
||||||
};
|
|
||||||
|
@@ -26,8 +26,6 @@ class Path;
|
|||||||
class Mutex;
|
class Mutex;
|
||||||
class Cond;
|
class Cond;
|
||||||
|
|
||||||
extern const struct InputPlugin input_plugin_archive;
|
|
||||||
|
|
||||||
InputStreamPtr
|
InputStreamPtr
|
||||||
OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond);
|
OpenArchiveInputStream(Path path, Mutex &mutex, Cond &cond);
|
||||||
|
|
||||||
|
@@ -75,15 +75,6 @@ OpenFileInputStream(Path path,
|
|||||||
mutex, cond);
|
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
|
void
|
||||||
FileInputStream::Seek(offset_type new_offset)
|
FileInputStream::Seek(offset_type new_offset)
|
||||||
{
|
{
|
||||||
@@ -108,10 +99,3 @@ FileInputStream::Read(void *ptr, size_t read_size)
|
|||||||
offset += nbytes;
|
offset += nbytes;
|
||||||
return nbytes;
|
return nbytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
const InputPlugin input_plugin_file = {
|
|
||||||
"file",
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
input_file_open,
|
|
||||||
};
|
|
||||||
|
@@ -26,8 +26,6 @@ class Path;
|
|||||||
class Mutex;
|
class Mutex;
|
||||||
class Cond;
|
class Cond;
|
||||||
|
|
||||||
extern const struct InputPlugin input_plugin_file;
|
|
||||||
|
|
||||||
InputStreamPtr
|
InputStreamPtr
|
||||||
OpenFileInputStream(Path path,
|
OpenFileInputStream(Path path,
|
||||||
Mutex &mutex, Cond &cond);
|
Mutex &mutex, Cond &cond);
|
||||||
|
Reference in New Issue
Block a user