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

decoder_thread: move code to decoder_command_finished_locked()

This commit is contained in:
Max Kellermann 2011-01-10 20:59:02 +01:00
parent acca6a799b
commit 39c5af5dbc
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/decoder_thread.c
View File

@ -54,6 +54,22 @@ decoder_lock_get_command(struct decoder_control *dc)
return command;
}
/**
* Marks the current decoder command as "finished" and notifies the
* player thread.
*
* @param dc the #decoder_control object; must be locked
*/
static void
decoder_command_finished_locked(struct decoder_control *dc)
{
assert(dc->command != DECODE_COMMAND_NONE);
dc->command = DECODE_COMMAND_NONE;
player_signal(dc->player_control);
}
/**
* Opens the input stream with input_stream_open(), and waits until
* the stream gets ready. If a decoder STOP command is received
@ -381,9 +397,8 @@ decoder_run_song(struct decoder_control *dc,
decoder.chunk = NULL;
dc->state = DECODE_STATE_START;
dc->command = DECODE_COMMAND_NONE;
player_signal(dc->player_control);
decoder_command_finished_locked(dc);
pcm_convert_init(&decoder.conv_state);
@ -462,15 +477,11 @@ decoder_task(gpointer arg)
case DECODE_COMMAND_SEEK:
decoder_run(dc);
dc->command = DECODE_COMMAND_NONE;
player_signal(dc->player_control);
decoder_command_finished_locked(dc);
break;
case DECODE_COMMAND_STOP:
dc->command = DECODE_COMMAND_NONE;
player_signal(dc->player_control);
decoder_command_finished_locked(dc);
break;
case DECODE_COMMAND_NONE: