From 07adb14e3c4daa8b1e6ebc69e54128b38b014d30 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sat, 26 Jan 2008 12:46:21 +0000 Subject: fixed -Wshadow warnings Signed-off-by: Eric Wong git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/player.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/player.c') 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); -- cgit v1.2.3