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

InputStream: convert to class

Browse Source
This commit is contained in:
Max Kellermann
2014-05-11 15:34:48 +02:00
parent ee2afb35dd
commit 6773adc771
31 changed files with 132 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/decoder/DecoderThread.cxx
View File

@@ -87,7 +87,7 @@ decoder_input_stream_open(DecoderControl &dc, const char *uri)
dc.Lock();
is->Update();
while (!is->ready &&
while (!is->IsReady() &&
dc.command != DecoderCommand::STOP) {
dc.Wait();
@@ -114,7 +114,7 @@ decoder_stream_decode(const DecoderPlugin &plugin,
assert(plugin.stream_decode != nullptr);
assert(decoder.stream_tag == nullptr);
assert(decoder.decoder_tag == nullptr);
assert(input_stream.ready);
assert(input_stream.IsReady());
assert(decoder.dc.state == DecoderState::START);
FormatDebug(decoder_thread_domain, "probing plugin %s", plugin.name);
@@ -179,7 +179,8 @@ decoder_check_plugin_mime(const DecoderPlugin &plugin, const InputStream &is)
{
assert(plugin.stream_decode != nullptr);
return !is.mime.empty() && plugin.SupportsMimeType(is.mime.c_str());
const char *mime_type = is.GetMimeType();
return mime_type != nullptr && plugin.SupportsMimeType(mime_type);
}
gcc_pure