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

7
src/TagArchive.cxx
View File

@@ -22,16 +22,14 @@
#include "TagStream.hxx"
#include "archive/ArchiveFile.hxx"
#include "input/InputStream.hxx"
#include "thread/Cond.hxx"
bool
tag_archive_scan(ArchiveFile &archive, const char *path_utf8,
const TagHandler &handler, void *handler_ctx) noexcept
try {
Mutex mutex;
Cond cond;
auto is = archive.OpenStream(path_utf8, mutex, cond);
auto is = archive.OpenStream(path_utf8, mutex);
if (!is)
return false;
@@ -45,9 +43,8 @@ tag_archive_scan(ArchiveFile &archive, const char *path_utf8,
TagBuilder &builder) noexcept
try {
Mutex mutex;
Cond cond;
auto is = archive.OpenStream(path_utf8, mutex, cond);
auto is = archive.OpenStream(path_utf8, mutex);
return is && tag_stream_scan(*is, builder);
} catch (const std::exception &e) {
return false;