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/command/FileCommands.cxx
View File

@@ -40,7 +40,6 @@
#include "LocateUri.hxx"
#include "TimePrint.hxx"
#include "thread/Mutex.hxx"
#include "thread/Cond.hxx"
#include <assert.h>
#include <inttypes.h> /* for PRIu64 */
@@ -244,7 +243,7 @@ handle_read_comments(Client &client, Request args, Response &r)
* opened file or #nullptr on failure.
*/
static InputStreamPtr
find_stream_art(const char *directory, Mutex &mutex, Cond &cond)
find_stream_art(const char *directory, Mutex &mutex)
{
static constexpr char const * art_names[] = {
"cover.png",
@@ -257,7 +256,7 @@ find_stream_art(const char *directory, Mutex &mutex, Cond &cond)
std::string art_file = PathTraitsUTF8::Build(directory, name);
try {
return InputStream::OpenReady(art_file.c_str(), mutex, cond);
return InputStream::OpenReady(art_file.c_str(), mutex);
} catch (const std::exception &e) {}
}
return nullptr;
@@ -269,9 +268,8 @@ read_stream_art(Response &r, const char *uri, size_t offset)
std::string art_directory = PathTraitsUTF8::GetParent(uri);
Mutex mutex;
Cond cond;
InputStreamPtr is = find_stream_art(art_directory.c_str(), mutex, cond);
InputStreamPtr is = find_stream_art(art_directory.c_str(), mutex);
if (is == nullptr) {
r.Error(ACK_ERROR_NO_EXIST, "No file exists");