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

decoder/API: simplify the client==nullptr code path in decoder_read()

Browse Source
This commit is contained in:
Max Kellermann 2016-11-21 22:09:15 +01:00
parent 2718f4c333
commit 322bfbaf57
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/decoder/DecoderAPI.cxx
View File

@ -256,37 +256,29 @@ DecoderBridge::OpenUri(const char *uri)
} }
} }
/**
* Should be read operation be cancelled? That is the case when the
* player thread has sent a command such as "STOP".
*/
gcc_pure
static inline bool
decoder_check_cancel_read(const DecoderBridge *bridge)
{
return bridge != nullptr && bridge->CheckCancelRead();
}
size_t size_t
decoder_read(DecoderClient *client, decoder_read(DecoderClient *client,
InputStream &is, InputStream &is,
void *buffer, size_t length) void *buffer, size_t length)
try { try {
/* XXX don't allow decoder==nullptr */
auto *bridge = (DecoderBridge *)client;
assert(bridge == nullptr ||
bridge->dc.state == DecoderState::START ||
bridge->dc.state == DecoderState::DECODE);
assert(buffer != nullptr); assert(buffer != nullptr);
/* XXX don't allow client==nullptr */
if (client == nullptr)
return is.LockRead(buffer, length);
auto &bridge = *(DecoderBridge *)client;
assert(bridge.dc.state == DecoderState::START ||
bridge.dc.state == DecoderState::DECODE);
if (length == 0) if (length == 0)
return 0; return 0;
ScopeLock lock(is.mutex); ScopeLock lock(is.mutex);
while (true) { while (true) {
if (decoder_check_cancel_read(bridge)) if (bridge.CheckCancelRead())
return 0; return 0;
if (is.IsAvailable()) if (is.IsAvailable())