player: added player.song
Always remember which song is currently being sent to the audio device.
This commit is contained in:
parent
accc82cd6c
commit
7e7704e42b
|
@ -56,6 +56,11 @@ struct player {
|
||||||
*/
|
*/
|
||||||
bool queued;
|
bool queued;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* the song currently being played
|
||||||
|
*/
|
||||||
|
struct song *song;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* is cross fading enabled?
|
* is cross fading enabled?
|
||||||
*/
|
*/
|
||||||
|
@ -99,6 +104,7 @@ static int waitOnDecode(struct player *player)
|
||||||
pc.bitRate = 0;
|
pc.bitRate = 0;
|
||||||
audio_format_clear(&pc.audio_format);
|
audio_format_clear(&pc.audio_format);
|
||||||
|
|
||||||
|
player->song = pc.next_song;
|
||||||
pc.next_song = NULL;
|
pc.next_song = NULL;
|
||||||
player->queued = false;
|
player->queued = false;
|
||||||
player->decoder_starting = true;
|
player->decoder_starting = true;
|
||||||
|
@ -233,6 +239,7 @@ static void do_play(void)
|
||||||
.decoder_starting = false,
|
.decoder_starting = false,
|
||||||
.paused = false,
|
.paused = false,
|
||||||
.queued = false,
|
.queued = false,
|
||||||
|
.song = NULL,
|
||||||
.xfade = XFADE_UNKNOWN,
|
.xfade = XFADE_UNKNOWN,
|
||||||
.next_song_chunk = -1,
|
.next_song_chunk = -1,
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue