Skip to content

M
mpd
Commit 66f1d1dd authored by Max Kellermann's avatar Max Kellermann Committed by Eric Wong
Browse files
Options

pass pc to set_current_song()

git-svn-id: https://svn.musicpd.org/mpd/trunk@7322 09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent 1465bfab
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
src/player.c
View file @ 66f1d1dd
...@@ -107,10 +107,8 @@ int playerWait(int fd) ...@@ -107,10 +107,8 @@ int playerWait(int fd)
return 0; return 0;
} }
static void set_current_song(Song *song) static void set_current_song(PlayerControl * pc, Song *song)
{ {
PlayerControl *pc = &(getPlayerData()->playerControl);
pc->fileTime = song->tag ? song->tag->time : 0; pc->fileTime = song->tag ? song->tag->time : 0;
pc->current_song = song; pc->current_song = song;
} }
...@@ -122,7 +120,7 @@ int playerPlay(int fd, Song * song) ...@@ -122,7 +120,7 @@ int playerPlay(int fd, Song * song)
if (playerStop(fd) < 0) if (playerStop(fd) < 0)
return -1; return -1;
set_current_song(song); set_current_song(pc, song);
pc->play = 1; pc->play = 1;
/* FIXME: _nb() variant is probably wrong here, and everywhere... */ /* FIXME: _nb() variant is probably wrong here, and everywhere... */
...@@ -258,7 +256,7 @@ int queueSong(Song * song) ...@@ -258,7 +256,7 @@ int queueSong(Song * song)
PlayerControl *pc = &(getPlayerData()->playerControl); PlayerControl *pc = &(getPlayerData()->playerControl);
if (pc->queueState == PLAYER_QUEUE_BLANK) { if (pc->queueState == PLAYER_QUEUE_BLANK) {
set_current_song(song); set_current_song(pc, song);
pc->queueState = PLAYER_QUEUE_FULL; pc->queueState = PLAYER_QUEUE_FULL;
return 0; return 0;
} }
...@@ -314,7 +312,7 @@ int playerSeek(int fd, Song * song, float seek_time) ...@@ -314,7 +312,7 @@ int playerSeek(int fd, Song * song, float seek_time)
} }
if (pc->current_song != song) if (pc->current_song != song)
set_current_song(song); set_current_song(pc, song);
if (pc->error == PLAYER_ERROR_NOERROR) { if (pc->error == PLAYER_ERROR_NOERROR) {
pc->seekWhere = seek_time; pc->seekWhere = seek_time;
......
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