Skip to content

M
mpd
Commit 77a647fc authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder_thread: open input stream after command finished

Return the result to the caller more quickly. This unifies error handling: no error can be reported before the command is finished.
parent 59ffb5b7
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
src/decoder_thread.c
View file @ 77a647fc
......@@ -101,11 +101,6 @@ decoder_run_song(struct decoder_control *dc,
struct input_stream input_stream;
const struct decoder_plugin *plugin;
if (!input_stream_open(&input_stream, uri)) {
dc->state = DECODE_STATE_ERROR;
return;
}
decoder.seeking = false;
decoder.song_tag = song->tag != NULL && song_is_file(song)
? tag_dup(song->tag) : NULL;
......@@ -118,6 +113,16 @@ decoder_run_song(struct decoder_control *dc,
player_signal();
decoder_unlock(dc);
if (!input_stream_open(&input_stream, uri)) {
decoder_lock(dc);
dc->state = DECODE_STATE_ERROR;
return;
}
decoder_lock(dc);
/* wait for the input stream to become ready; its metadata
will be available then */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment