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

player_thread: moved code to player_dc_start()

Browse Source
This commit is contained in:
Max Kellermann 2009-11-03 21:01:56 +01:00
parent 7fd2097a44
commit 6c78c21fb8
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/player_thread.c
View File

@ -123,6 +123,22 @@ static void player_command_finished(void)
player_unlock(); player_unlock();
} }
/**
* Start the decoder.
*
* Player lock is not held.
*/
static void
player_dc_start(struct player *player)
{
struct decoder_control *dc = player->dc;
assert(player->queued);
assert(pc.next_song != NULL);
dc_start(dc, pc.next_song);
}
/** /**
* Stop the decoder and clears (and frees) its music pipe. * Stop the decoder and clears (and frees) its music pipe.
* *
@ -323,7 +339,7 @@ static bool player_seek_decoder(struct player *player)
dc->pipe = player->pipe; dc->pipe = player->pipe;
/* re-start the decoder */ /* re-start the decoder */
dc_start(dc, pc.next_song); player_dc_start(player);
ret = player_wait_for_decoder(player); ret = player_wait_for_decoder(player);
if (!ret) { if (!ret) {
/* decoder failure */ /* decoder failure */
@ -688,7 +704,7 @@ static void do_play(struct decoder_control *dc)
.buffering = true, .buffering = true,
.decoder_starting = false, .decoder_starting = false,
.paused = false, .paused = false,
.queued = false, .queued = true,
.song = NULL, .song = NULL,
.xfade = XFADE_UNKNOWN, .xfade = XFADE_UNKNOWN,
.cross_fading = false, .cross_fading = false,
@ -702,7 +718,7 @@ static void do_play(struct decoder_control *dc)
dc->buffer = player_buffer; dc->buffer = player_buffer;
dc->pipe = player.pipe; dc->pipe = player.pipe;
dc_start(dc, pc.next_song); player_dc_start(&player);
if (!player_wait_for_decoder(&player)) { if (!player_wait_for_decoder(&player)) {
player_dc_stop(&player); player_dc_stop(&player);
player_command_finished(); player_command_finished();
@ -781,9 +797,8 @@ static void do_play(struct decoder_control *dc)
assert(pc.next_song != NULL); assert(pc.next_song != NULL);
assert(dc->pipe == NULL || dc->pipe == player.pipe); assert(dc->pipe == NULL || dc->pipe == player.pipe);
player.queued = false;
dc->pipe = music_pipe_new(); dc->pipe = music_pipe_new();
dc_start(dc, pc.next_song); player_dc_start(&player);
} }
if (dc->pipe != NULL && dc->pipe != player.pipe && if (dc->pipe != NULL && dc->pipe != player.pipe &&