From d507ff28c8ae18d4a17c8565de723fb522d2473d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 26 Aug 2008 08:27:03 +0200 Subject: added dc.next_song, renamed pc.current_song Since pc->current_song denotes the song which the decoder should use next, we should move it to DecoderControl. This removes one internal PlayerControl struct access from the decoder code. Also add pc.next_song, which is manipulated by the playlist code, and gets copied to dc.next_song as soon as the decoder is started. --- src/player.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/player.c') diff --git a/src/player.c b/src/player.c index bdce70bbf..61b380b84 100644 --- a/src/player.c +++ b/src/player.c @@ -18,7 +18,6 @@ #include "player.h" #include "path.h" -#include "decode.h" #include "command.h" #include "log.h" #include "playerData.h" @@ -101,7 +100,7 @@ int playerWait(int fd) static void set_current_song(Song *song) { pc.fileTime = song->tag ? song->tag->time : 0; - pc.current_song = song; + pc.next_song = song; } int playerPlay(int fd, Song * song) @@ -279,7 +278,7 @@ int playerSeek(int fd, Song * song, float seek_time) return -1; } - if (pc.current_song != song) + if (pc.next_song != song) set_current_song(song); if (pc.error == PLAYER_ERROR_NOERROR) { -- cgit v1.2.3