aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-11-02 20:20:14 +0100
committerMax Kellermann <max@duempel.org>2009-11-02 20:20:14 +0100
commit0f9f82f2275924b6ad2e8f8a9df32494226d96e6 (patch)
treed54061af76193963ec1792149b5000b7652f4760
parent55e3aa81791f90589b9fd5fcef2daadcf72fa8b1 (diff)
downloadmpd-0f9f82f2275924b6ad2e8f8a9df32494226d96e6.tar.gz
mpd-0f9f82f2275924b6ad2e8f8a9df32494226d96e6.tar.xz
mpd-0f9f82f2275924b6ad2e8f8a9df32494226d96e6.zip
output_thread: moved code to ao_next_chunk()
Diffstat (limited to '')
-rw-r--r--src/output_thread.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/output_thread.c b/src/output_thread.c
index 39b644e38..40906d82f 100644
--- a/src/output_thread.c
+++ b/src/output_thread.c
@@ -312,6 +312,16 @@ ao_play_chunk(struct audio_output *ao, const struct music_chunk *chunk)
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
* 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);
- chunk = ao->chunk;
- if (chunk != NULL)
- /* continue the previous play() call */
- chunk = chunk->next;
- else
- chunk = music_pipe_peek(ao->pipe);
+ chunk = ao_next_chunk(ao);
if (chunk == NULL)
/* no chunk available */
return false;