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

added dc.next_song, renamed pc.current_song

Browse Source 
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.
This commit is contained in:
Max Kellermann
2008-08-26 08:27:03 +02:00
parent b6909da758
commit d507ff28c8
4 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/player.c
View File

@@ -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) {