Skip to content

M
mpd
Commit 7e7704e4 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

player: added player.song

Always remember which song is currently being sent to the audio device.
parent accc82cd
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 0 deletions
src/player_thread.c
View file @ 7e7704e4
...@@ -57,6 +57,11 @@ struct player { ...@@ -57,6 +57,11 @@ struct player {
bool queued; bool queued;
/** /**
* the song currently being played
*/
struct song *song;
/**
* is cross fading enabled? * is cross fading enabled?
*/ */
enum xfade_state xfade; enum xfade_state xfade;
...@@ -99,6 +104,7 @@ static int waitOnDecode(struct player *player) ...@@ -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) ...@@ -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,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment