aboutsummaryrefslogtreecommitdiffstats
path: root/src/player.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-01-26 12:46:21 +0000
committerEric Wong <normalperson@yhbt.net>2008-01-26 12:46:21 +0000
commit07adb14e3c4daa8b1e6ebc69e54128b38b014d30 (patch)
tree7d22b4b2eb31a9bf46cf648731fe1370005ab1c9 /src/player.c
parent28008e697720bb2b11989bb887eb468b91409b1a (diff)
downloadmpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.tar.gz
mpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.tar.xz
mpd-07adb14e3c4daa8b1e6ebc69e54128b38b014d30.zip
fixed -Wshadow warnings
Signed-off-by: Eric Wong <normalperson@yhbt.net> git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/player.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/player.c b/src/player.c
index 45e3f5ca9..547b2b737 100644
--- a/src/player.c
+++ b/src/player.c
@@ -276,7 +276,7 @@ int playerPause(int fd)
return 0;
}
-int playerSetPause(int fd, int pause)
+int playerSetPause(int fd, int pause_flag)
{
PlayerControl *pc = &(getPlayerData()->playerControl);
@@ -285,11 +285,11 @@ int playerSetPause(int fd, int pause)
switch (pc->state) {
case PLAYER_STATE_PLAY:
- if (pause)
+ if (pause_flag)
playerPause(fd);
break;
case PLAYER_STATE_PAUSE:
- if (!pause)
+ if (!pause_flag)
playerPause(fd);
break;
}
@@ -436,7 +436,7 @@ void playerQueueUnlock(void)
}
}
-int playerSeek(int fd, Song * song, float time)
+int playerSeek(int fd, Song * song, float seek_time)
{
PlayerControl *pc = &(getPlayerData()->playerControl);
char path_max_tmp[MPD_PATH_MAX];
@@ -452,7 +452,7 @@ int playerSeek(int fd, Song * song, float time)
if (pc->error == PLAYER_ERROR_NOERROR) {
resetPlayerMetadata();
- pc->seekWhere = time;
+ pc->seekWhere = seek_time;
pc->seek = 1;
if (player_pid > 0 && pc->state == PLAYER_STATE_PAUSE)
kill(player_pid, SIGCONT);