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

decoder/Thread: throw InputStream::Open() errors

Browse Source 
Code simplification.
This commit is contained in:
Max Kellermann 2016-09-08 20:48:04 +02:00
parent 78ec7d0fe1
commit 25f7360264
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/decoder/DecoderThread.cxx
View File

@ -52,15 +52,14 @@ static constexpr Domain decoder_thread_domain("decoder_thread");
* the stream gets ready. * the stream gets ready.
* *
* Unlock the decoder before calling this function. * Unlock the decoder before calling this function.
*
* @return an InputStream on success, nullptr on error
*/ */
static InputStreamPtr static InputStreamPtr
decoder_input_stream_open(DecoderControl &dc, const char *uri, Error &error) decoder_input_stream_open(DecoderControl &dc, const char *uri)
{ {
Error error;
auto is = InputStream::Open(uri, dc.mutex, dc.cond, error); auto is = InputStream::Open(uri, dc.mutex, dc.cond, error);
if (is == nullptr) if (is == nullptr)
return nullptr; throw error;
/* wait for the input stream to become ready; its metadata /* wait for the input stream to become ready; its metadata
will be available then */ will be available then */
@ -78,17 +77,18 @@ decoder_input_stream_open(DecoderControl &dc, const char *uri, Error &error)
} }
if (!is->Check(error)) if (!is->Check(error))
return nullptr; throw error;
return is; return is;
} }
static InputStreamPtr static InputStreamPtr
decoder_input_stream_open(DecoderControl &dc, Path path, Error &error) decoder_input_stream_open(DecoderControl &dc, Path path)
{ {
Error error;
auto is = OpenLocalInputStream(path, dc.mutex, dc.cond, error); auto is = OpenLocalInputStream(path, dc.mutex, dc.cond, error);
if (is == nullptr) if (is == nullptr)
return nullptr; throw error;
assert(is->IsReady()); assert(is->IsReady());
@ -270,9 +270,8 @@ decoder_run_stream(Decoder &decoder, const char *uri)
{ {
DecoderControl &dc = decoder.dc; DecoderControl &dc = decoder.dc;
auto input_stream = decoder_input_stream_open(dc, uri, decoder.error); auto input_stream = decoder_input_stream_open(dc, uri);
if (input_stream == nullptr) assert(input_stream);
return false;
LoadReplayGain(decoder, *input_stream); LoadReplayGain(decoder, *input_stream);
@ -327,10 +326,8 @@ decoder_run_file(Decoder &decoder, const char *uri_utf8, Path path_fs)
if (suffix == nullptr) if (suffix == nullptr)
return false; return false;
auto input_stream = decoder_input_stream_open(decoder.dc, path_fs, auto input_stream = decoder_input_stream_open(decoder.dc, path_fs);
decoder.error); assert(input_stream);
if (input_stream == nullptr)
return false;
LoadReplayGain(decoder, *input_stream); LoadReplayGain(decoder, *input_stream);