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

output_thread: moved code to ao_next_chunk()

Browse Source
This commit is contained in:
Max Kellermann 2009-11-02 20:20:14 +01:00
parent 55e3aa8179
commit 0f9f82f227
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/output_thread.c
View File

@ -312,6 +312,16 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
return true; return true;
} }
static const struct music_chunk *
ao_next_chunk(struct audio_output *ao)
{
return ao->chunk != NULL
/* continue the previous play() call */
? ao->chunk->next
/* get the first chunk from the pipe */
: music_pipe_peek(ao->pipe);
}
/** /**
* Plays all remaining chunks, until the tail of the pipe has been * Plays all remaining chunks, until the tail of the pipe has been
* reached (and no more chunks are queued), or until a command is * reached (and no more chunks are queued), or until a command is
@ -328,12 +338,7 @@ ao_play(struct audio_output *ao)
assert(ao->pipe != NULL); assert(ao->pipe != NULL);
chunk = ao->chunk; chunk = ao_next_chunk(ao);
if (chunk != NULL)
/* continue the previous play() call */
chunk = chunk->next;
else
chunk = music_pipe_peek(ao->pipe);
if (chunk == NULL) if (chunk == NULL)
/* no chunk available */ /* no chunk available */
return false; return false;