oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/Stream: remove attribute "cond", replace with handler interface

Browse Source 
This adds a bit of overhead, but also adds flexibility to the API,
because arbitrary triggers may be invoked from that virtual method
implementation, not just Cond::signal().

The motivation for this is to make the handlers more dynamic, for the
upcoming buffering class utilizing ProxyInputStream.
This commit is contained in:
Max Kellermann
2018-06-22 19:37:18 +02:00
parent 01d8eb6290
commit d0fbf6db59
66 changed files with 403 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/plugins/FfmpegInputPlugin.cxx
View File

@@ -39,9 +39,9 @@ struct FfmpegInputStream final : public InputStream {
bool eof;
FfmpegInputStream(const char *_uri, Mutex &_mutex, Cond &_cond,
FfmpegInputStream(const char *_uri, Mutex &_mutex,
AVIOContext *_h)
:InputStream(_uri, _mutex, _cond),
:InputStream(_uri, _mutex),
h(_h), eof(false) {
seekable = (h->seekable & AVIO_SEEKABLE_NORMAL) != 0;
size = avio_size(h);
@@ -83,7 +83,7 @@ input_ffmpeg_init(EventLoop &, const ConfigBlock &)
static InputStreamPtr
input_ffmpeg_open(const char *uri,
Mutex &mutex, Cond &cond)
Mutex &mutex)
{
if (!StringStartsWith(uri, "gopher://") &&
!StringStartsWith(uri, "rtp://") &&
@@ -98,7 +98,7 @@ input_ffmpeg_open(const char *uri,
if (result != 0)
throw MakeFfmpegError(result);
return std::make_unique<FfmpegInputStream>(uri, mutex, cond, h);
return std::make_unique<FfmpegInputStream>(uri, mutex, h);
}
size_t