From 66f1d1ddb356ca69a6a0e738d2afde9c65459bd2 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 12 Apr 2008 04:19:44 +0000
Subject: [PATCH] pass pc to set_current_song()
git-svn-id: https://svn.musicpd.org/mpd/trunk@7322 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---
src/player.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/player.c b/src/player.c
index 9fc55ec02..b38769331 100644
--- a/src/player.c
+++ b/src/player.c
@@ -107,10 +107,8 @@ int playerWait(int fd)
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->current_song = song;
}
@@ -122,7 +120,7 @@ int playerPlay(int fd, Song * song)
if (playerStop(fd) < 0)
return -1;
- set_current_song(song);
+ set_current_song(pc, song);
pc->play = 1;
/* FIXME: _nb() variant is probably wrong here, and everywhere... */
@@ -258,7 +256,7 @@ int queueSong(Song * song)
PlayerControl *pc = &(getPlayerData()->playerControl);
if (pc->queueState == PLAYER_QUEUE_BLANK) {
- set_current_song(song);
+ set_current_song(pc, song);
pc->queueState = PLAYER_QUEUE_FULL;
return 0;
}
@@ -314,7 +312,7 @@ int playerSeek(int fd, Song * song, float seek_time)
}
if (pc->current_song != song)
- set_current_song(song);
+ set_current_song(pc, song);
if (pc->error == PLAYER_ERROR_NOERROR) {
pc->seekWhere = seek_time;