oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fixed -Wshadow warnings

Browse Source 
Signed-off-by: Eric Wong <normalperson@yhbt.net>

git-svn-id: https://svn.musicpd.org/mpd/trunk@7143 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
Max Kellermann
2008-01-26 12:46:21 +00:00
committed by Eric Wong
parent 28008e6977
commit 07adb14e3c
20 changed files with 185 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/player.c
View File

@@ -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);