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

player_thread: moved code to player_song_border()

Browse Source 
Moved some more cruft out of do_play().
This commit is contained in:
Max Kellermann 2009-03-09 19:15:14 +01:00
parent 4459a46181
commit 9f79c05e43
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/player_thread.c
View File

@ -459,6 +459,24 @@ play_next_chunk(struct player *player)
return true;
}
/**
* This is called at the border between two songs: the audio output
* has consumed all chunks of the current song, and we should start
* sending chunks from the next one.
*
* @return true on success, false on error (playback will be stopped)
*/
static bool
player_song_border(struct player *player)
{
player->xfade = XFADE_UNKNOWN;
music_pipe_free(player->pipe);
player->pipe = dc.pipe;
return player_wait_for_decoder(player);
}
static void do_play(void)
{
struct player player = {
@ -572,12 +590,7 @@ static void do_play(void)
} else if (dc.pipe != NULL && dc.pipe != player.pipe) {
/* at the beginning of a new song */
player.xfade = XFADE_UNKNOWN;
music_pipe_free(player.pipe);
player.pipe = dc.pipe;
if (!player_wait_for_decoder(&player))
if (!player_song_border(&player))
break;
} else if (decoder_is_idle()) {
break;