Skip to content

M
mpd
Commit 347e8162 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder: reset state and command in decoder_task()

Eliminate one goto in decodeStart() by moving some cleanup to decoder_task().
parent 86fbac54
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
src/decoder_thread.c
View file @ 347e8162
......@@ -46,7 +46,7 @@ static void decodeStart(void)
dc.current_song = dc.next_song; /* NEED LOCK */
if (!input_stream_open(&inStream, path_max_fs)) {
dc.error = DECODE_ERROR_FILE;
goto stop_no_close;
return;
}
decoder.seeking = false;
......@@ -159,9 +159,6 @@ static void decodeStart(void)
stop:
if (close_instream)
input_stream_close(&inStream);
stop_no_close:
dc.state = DECODE_STATE_STOP;
dc.command = DECODE_COMMAND_NONE;
}
static void * decoder_task(mpd_unused void *arg)
......@@ -173,6 +170,9 @@ static void * decoder_task(mpd_unused void *arg)
case DECODE_COMMAND_START:
case DECODE_COMMAND_SEEK:
decodeStart();
dc.state = DECODE_STATE_STOP;
dc.command = DECODE_COMMAND_NONE;
break;
case DECODE_COMMAND_STOP:
......
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