InputStream: remove attribute "plugin"
This commit is contained in:
parent
d4b625b48e
commit
fd1b04932a
@ -108,8 +108,6 @@ struct Bzip2InputStream final : public InputStream {
|
|||||||
size_t Read(void *ptr, size_t size, Error &error) override;
|
size_t Read(void *ptr, size_t size, Error &error) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const InputPlugin bz2_inputplugin;
|
|
||||||
|
|
||||||
static constexpr Domain bz2_domain("bz2");
|
static constexpr Domain bz2_domain("bz2");
|
||||||
|
|
||||||
/* single archive handling allocation helpers */
|
/* single archive handling allocation helpers */
|
||||||
@ -155,7 +153,7 @@ bz2_open(Path pathname, Error &error)
|
|||||||
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context,
|
Bzip2InputStream::Bzip2InputStream(Bzip2ArchiveFile &_context,
|
||||||
const char *_uri,
|
const char *_uri,
|
||||||
Mutex &_mutex, Cond &_cond)
|
Mutex &_mutex, Cond &_cond)
|
||||||
:InputStream(bz2_inputplugin, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
archive(&_context), eof(false)
|
archive(&_context), eof(false)
|
||||||
{
|
{
|
||||||
archive->Ref();
|
archive->Ref();
|
||||||
@ -251,13 +249,6 @@ static const char *const bz2_extensions[] = {
|
|||||||
nullptr
|
nullptr
|
||||||
};
|
};
|
||||||
|
|
||||||
const InputPlugin bz2_inputplugin = {
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
};
|
|
||||||
|
|
||||||
const ArchivePlugin bz2_archive_plugin = {
|
const ArchivePlugin bz2_archive_plugin = {
|
||||||
"bz2",
|
"bz2",
|
||||||
nullptr,
|
nullptr,
|
||||||
|
@ -79,8 +79,6 @@ public:
|
|||||||
Error &error) override;
|
Error &error) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const InputPlugin iso9660_input_plugin;
|
|
||||||
|
|
||||||
static constexpr Domain iso9660_domain("iso9660");
|
static constexpr Domain iso9660_domain("iso9660");
|
||||||
|
|
||||||
/* archive open && listing routine */
|
/* archive open && listing routine */
|
||||||
@ -149,7 +147,7 @@ public:
|
|||||||
Iso9660InputStream(Iso9660ArchiveFile &_archive, const char *_uri,
|
Iso9660InputStream(Iso9660ArchiveFile &_archive, const char *_uri,
|
||||||
Mutex &_mutex, Cond &_cond,
|
Mutex &_mutex, Cond &_cond,
|
||||||
iso9660_stat_t *_statbuf)
|
iso9660_stat_t *_statbuf)
|
||||||
:InputStream(iso9660_input_plugin, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
archive(_archive), statbuf(_statbuf) {
|
archive(_archive), statbuf(_statbuf) {
|
||||||
size = statbuf->size;
|
size = statbuf->size;
|
||||||
SetReady();
|
SetReady();
|
||||||
@ -231,13 +229,6 @@ static const char *const iso9660_archive_extensions[] = {
|
|||||||
nullptr
|
nullptr
|
||||||
};
|
};
|
||||||
|
|
||||||
const InputPlugin iso9660_input_plugin = {
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
};
|
|
||||||
|
|
||||||
const ArchivePlugin iso9660_archive_plugin = {
|
const ArchivePlugin iso9660_archive_plugin = {
|
||||||
"iso",
|
"iso",
|
||||||
nullptr,
|
nullptr,
|
||||||
|
@ -64,8 +64,6 @@ public:
|
|||||||
Error &error) override;
|
Error &error) override;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const InputPlugin zzip_input_plugin;
|
|
||||||
|
|
||||||
static constexpr Domain zzip_domain("zzip");
|
static constexpr Domain zzip_domain("zzip");
|
||||||
|
|
||||||
/* archive open && listing routine */
|
/* archive open && listing routine */
|
||||||
@ -105,7 +103,7 @@ struct ZzipInputStream final : public InputStream {
|
|||||||
ZzipInputStream(ZzipArchiveFile &_archive, const char *_uri,
|
ZzipInputStream(ZzipArchiveFile &_archive, const char *_uri,
|
||||||
Mutex &_mutex, Cond &_cond,
|
Mutex &_mutex, Cond &_cond,
|
||||||
ZZIP_FILE *_file)
|
ZZIP_FILE *_file)
|
||||||
:InputStream(zzip_input_plugin, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
archive(&_archive), file(_file) {
|
archive(&_archive), file(_file) {
|
||||||
//we are seekable (but its not recommendent to do so)
|
//we are seekable (but its not recommendent to do so)
|
||||||
seekable = true;
|
seekable = true;
|
||||||
@ -185,13 +183,6 @@ static const char *const zzip_archive_extensions[] = {
|
|||||||
nullptr
|
nullptr
|
||||||
};
|
};
|
||||||
|
|
||||||
const InputPlugin zzip_input_plugin = {
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
};
|
|
||||||
|
|
||||||
const ArchivePlugin zzip_archive_plugin = {
|
const ArchivePlugin zzip_archive_plugin = {
|
||||||
"zzip",
|
"zzip",
|
||||||
nullptr,
|
nullptr,
|
||||||
|
@ -32,18 +32,12 @@
|
|||||||
class Cond;
|
class Cond;
|
||||||
class Error;
|
class Error;
|
||||||
struct Tag;
|
struct Tag;
|
||||||
struct InputPlugin;
|
|
||||||
|
|
||||||
class InputStream {
|
class InputStream {
|
||||||
public:
|
public:
|
||||||
typedef int64_t offset_type;
|
typedef int64_t offset_type;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/**
|
|
||||||
* the plugin which implements this input stream
|
|
||||||
*/
|
|
||||||
const InputPlugin &plugin;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The absolute URI which was used to open this stream.
|
* The absolute URI which was used to open this stream.
|
||||||
*/
|
*/
|
||||||
@ -99,9 +93,8 @@ private:
|
|||||||
std::string mime;
|
std::string mime;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
InputStream(const InputPlugin &_plugin,
|
InputStream(const char *_uri, Mutex &_mutex, Cond &_cond)
|
||||||
const char *_uri, Mutex &_mutex, Cond &_cond)
|
:uri(_uri),
|
||||||
:plugin(_plugin), uri(_uri),
|
|
||||||
mutex(_mutex), cond(_cond),
|
mutex(_mutex), cond(_cond),
|
||||||
ready(false), seekable(false),
|
ready(false), seekable(false),
|
||||||
size(-1), offset(0) {
|
size(-1), offset(0) {
|
||||||
@ -140,10 +133,6 @@ public:
|
|||||||
Mutex &mutex, Cond &cond,
|
Mutex &mutex, Cond &cond,
|
||||||
Error &error);
|
Error &error);
|
||||||
|
|
||||||
const InputPlugin &GetPlugin() const {
|
|
||||||
return plugin;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The absolute URI which was used to open this stream.
|
* The absolute URI which was used to open this stream.
|
||||||
*
|
*
|
||||||
|
@ -67,7 +67,7 @@ ThreadInputStream::Start(Error &error)
|
|||||||
inline void
|
inline void
|
||||||
ThreadInputStream::ThreadFunc()
|
ThreadInputStream::ThreadFunc()
|
||||||
{
|
{
|
||||||
FormatThreadName("input:%s", GetPlugin().name);
|
FormatThreadName("input:%s", plugin);
|
||||||
|
|
||||||
Lock();
|
Lock();
|
||||||
if (!Open(postponed_error)) {
|
if (!Open(postponed_error)) {
|
||||||
|
@ -40,6 +40,8 @@ template<typename T> class CircularBuffer;
|
|||||||
* This works only for "streams": unknown length, no seeking, no tags.
|
* This works only for "streams": unknown length, no seeking, no tags.
|
||||||
*/
|
*/
|
||||||
class ThreadInputStream : public InputStream {
|
class ThreadInputStream : public InputStream {
|
||||||
|
const char *const plugin;
|
||||||
|
|
||||||
Thread thread;
|
Thread thread;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -65,10 +67,11 @@ class ThreadInputStream : public InputStream {
|
|||||||
bool eof;
|
bool eof;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
ThreadInputStream(const InputPlugin &_plugin,
|
ThreadInputStream(const char *_plugin,
|
||||||
const char *_uri, Mutex &_mutex, Cond &_cond,
|
const char *_uri, Mutex &_mutex, Cond &_cond,
|
||||||
size_t _buffer_size)
|
size_t _buffer_size)
|
||||||
:InputStream(_plugin, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
|
plugin(_plugin),
|
||||||
buffer_size(_buffer_size),
|
buffer_size(_buffer_size),
|
||||||
buffer(nullptr),
|
buffer(nullptr),
|
||||||
close(false), eof(false) {}
|
close(false), eof(false) {}
|
||||||
|
@ -84,7 +84,7 @@ public:
|
|||||||
AlsaInputStream(EventLoop &loop,
|
AlsaInputStream(EventLoop &loop,
|
||||||
const char *_uri, Mutex &_mutex, Cond &_cond,
|
const char *_uri, Mutex &_mutex, Cond &_cond,
|
||||||
snd_pcm_t *_handle, int _frame_size)
|
snd_pcm_t *_handle, int _frame_size)
|
||||||
:InputStream(input_plugin_alsa, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
MultiSocketMonitor(loop),
|
MultiSocketMonitor(loop),
|
||||||
DeferredMonitor(loop),
|
DeferredMonitor(loop),
|
||||||
capture_handle(_handle),
|
capture_handle(_handle),
|
||||||
|
@ -65,7 +65,7 @@ struct CdioParanoiaInputStream final : public InputStream {
|
|||||||
|
|
||||||
CdioParanoiaInputStream(const char *_uri, Mutex &_mutex, Cond &_cond,
|
CdioParanoiaInputStream(const char *_uri, Mutex &_mutex, Cond &_cond,
|
||||||
int _trackno)
|
int _trackno)
|
||||||
:InputStream(input_plugin_cdio_paranoia, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
drv(nullptr), cdio(nullptr), para(nullptr),
|
drv(nullptr), cdio(nullptr), para(nullptr),
|
||||||
trackno(_trackno)
|
trackno(_trackno)
|
||||||
{
|
{
|
||||||
|
@ -106,7 +106,7 @@ struct CurlInputStream final : public InputStream {
|
|||||||
|
|
||||||
CurlInputStream(const char *_url, Mutex &_mutex, Cond &_cond,
|
CurlInputStream(const char *_url, Mutex &_mutex, Cond &_cond,
|
||||||
void *_buffer)
|
void *_buffer)
|
||||||
:InputStream(input_plugin_curl, _url, _mutex, _cond),
|
:InputStream(_url, _mutex, _cond),
|
||||||
request_headers(nullptr),
|
request_headers(nullptr),
|
||||||
buffer((uint8_t *)_buffer, CURL_MAX_BUFFERED),
|
buffer((uint8_t *)_buffer, CURL_MAX_BUFFERED),
|
||||||
paused(false),
|
paused(false),
|
||||||
|
@ -48,7 +48,7 @@ class DespotifyInputStream final : public InputStream {
|
|||||||
Mutex &_mutex, Cond &_cond,
|
Mutex &_mutex, Cond &_cond,
|
||||||
despotify_session *_session,
|
despotify_session *_session,
|
||||||
ds_track *_track)
|
ds_track *_track)
|
||||||
:InputStream(input_plugin_despotify, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
session(_session), track(_track),
|
session(_session), track(_track),
|
||||||
tag(mpd_despotify_tag_from_track(*track)),
|
tag(mpd_despotify_tag_from_track(*track)),
|
||||||
len_available(0), eof(false) {
|
len_available(0), eof(false) {
|
||||||
|
@ -40,7 +40,7 @@ struct FfmpegInputStream final : public InputStream {
|
|||||||
|
|
||||||
FfmpegInputStream(const char *_uri, Mutex &_mutex, Cond &_cond,
|
FfmpegInputStream(const char *_uri, Mutex &_mutex, Cond &_cond,
|
||||||
AVIOContext *_h)
|
AVIOContext *_h)
|
||||||
:InputStream(input_plugin_ffmpeg, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
h(_h), eof(false) {
|
h(_h), eof(false) {
|
||||||
seekable = (h->seekable & AVIO_SEEKABLE_NORMAL) != 0;
|
seekable = (h->seekable & AVIO_SEEKABLE_NORMAL) != 0;
|
||||||
size = avio_size(h);
|
size = avio_size(h);
|
||||||
|
@ -38,7 +38,7 @@ struct FileInputStream final : public InputStream {
|
|||||||
|
|
||||||
FileInputStream(const char *path, int _fd, off_t _size,
|
FileInputStream(const char *path, int _fd, off_t _size,
|
||||||
Mutex &_mutex, Cond &_cond)
|
Mutex &_mutex, Cond &_cond)
|
||||||
:InputStream(input_plugin_file, path, _mutex, _cond),
|
:InputStream(path, _mutex, _cond),
|
||||||
fd(_fd) {
|
fd(_fd) {
|
||||||
size = _size;
|
size = _size;
|
||||||
seekable = true;
|
seekable = true;
|
||||||
|
@ -34,7 +34,7 @@ class MmsInputStream final : public ThreadInputStream {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
MmsInputStream(const char *_uri, Mutex &_mutex, Cond &_cond)
|
MmsInputStream(const char *_uri, Mutex &_mutex, Cond &_cond)
|
||||||
:ThreadInputStream(input_plugin_mms, _uri, _mutex, _cond,
|
:ThreadInputStream(input_plugin_mms.name, _uri, _mutex, _cond,
|
||||||
MMS_BUFFER_SIZE) {
|
MMS_BUFFER_SIZE) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ public:
|
|||||||
Mutex &_mutex, Cond &_cond,
|
Mutex &_mutex, Cond &_cond,
|
||||||
nfs_context *_ctx, nfsfh *_fh,
|
nfs_context *_ctx, nfsfh *_fh,
|
||||||
InputStream::offset_type _size)
|
InputStream::offset_type _size)
|
||||||
:InputStream(input_plugin_nfs, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
ctx(_ctx), fh(_fh) {
|
ctx(_ctx), fh(_fh) {
|
||||||
seekable = true;
|
seekable = true;
|
||||||
size = _size;
|
size = _size;
|
||||||
|
@ -26,13 +26,6 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
|
||||||
static const InputPlugin rewind_input_plugin = {
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
nullptr,
|
|
||||||
};
|
|
||||||
|
|
||||||
class RewindInputStream final : public InputStream {
|
class RewindInputStream final : public InputStream {
|
||||||
InputStream *input;
|
InputStream *input;
|
||||||
|
|
||||||
@ -59,7 +52,7 @@ class RewindInputStream final : public InputStream {
|
|||||||
|
|
||||||
public:
|
public:
|
||||||
RewindInputStream(InputStream *_input)
|
RewindInputStream(InputStream *_input)
|
||||||
:InputStream(rewind_input_plugin, _input->GetURI(),
|
:InputStream(_input->GetURI(),
|
||||||
_input->mutex, _input->cond),
|
_input->mutex, _input->cond),
|
||||||
input(_input), tail(0) {
|
input(_input), tail(0) {
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ public:
|
|||||||
SmbclientInputStream(const char *_uri,
|
SmbclientInputStream(const char *_uri,
|
||||||
Mutex &_mutex, Cond &_cond,
|
Mutex &_mutex, Cond &_cond,
|
||||||
SMBCCTX *_ctx, int _fd, const struct stat &st)
|
SMBCCTX *_ctx, int _fd, const struct stat &st)
|
||||||
:InputStream(input_plugin_smbclient, _uri, _mutex, _cond),
|
:InputStream(_uri, _mutex, _cond),
|
||||||
ctx(_ctx), fd(_fd) {
|
ctx(_ctx), fd(_fd) {
|
||||||
seekable = true;
|
seekable = true;
|
||||||
size = st.st_size;
|
size = st.st_size;
|
||||||
|
Loading…
Reference in New Issue
Block a user