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

decoder/Thread: eliminate decoder_input_stream_open()

This commit is contained in:
Max Kellermann 2019-04-05 10:31:52 +02:00
parent ac74f284aa
commit 28fc1d555f
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/decoder/Thread.cxx
View File

@ -47,16 +47,6 @@
static constexpr Domain decoder_thread_domain("decoder_thread"); static constexpr Domain decoder_thread_domain("decoder_thread");
static InputStreamPtr
decoder_input_stream_open(DecoderControl &dc, Path path)
{
auto is = OpenLocalInputStream(path, dc.mutex);
assert(is->IsReady());
return is;
}
/** /**
* Decode a stream with the given decoder plugin. * Decode a stream with the given decoder plugin.
* *
@ -351,7 +341,7 @@ decoder_run_file(DecoderBridge &bridge, const char *uri_utf8, Path path_fs)
InputStreamPtr input_stream; InputStreamPtr input_stream;
try { try {
input_stream = decoder_input_stream_open(bridge.dc, path_fs); input_stream = OpenLocalInputStream(path_fs, bridge.dc.mutex);
} catch (const std::system_error &e) { } catch (const std::system_error &e) {
if (IsPathNotFound(e) && if (IsPathNotFound(e) &&
/* ENOTDIR means this may be a path inside a /* ENOTDIR means this may be a path inside a