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

volume: don't pass "fd" to changeVolumeLevel()

Browse Source 
The "volume" library shouldn't talk to the client.  Move error
handling to command.c.
This commit is contained in:
Max Kellermann
2008-09-07 13:50:16 +02:00
parent 8e3c40f032
commit f7e414d934
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/command.c
View File

@@ -911,21 +911,33 @@ static int handleListAll(int fd, mpd_unused int *permission,
static int handleVolume(int fd, mpd_unused int *permission,
mpd_unused int argc, char *argv[])
{
int change;
int change, ret;
if (check_int(fd, &change, argv[1], need_integer) < 0)
return -1;
return changeVolumeLevel(fd, change, 1);
ret = changeVolumeLevel(change, 1);
if (ret == -1)
commandError(fd, ACK_ERROR_SYSTEM,
"problems setting volume");
return ret;
}
static int handleSetVol(int fd, mpd_unused int *permission,
mpd_unused int argc, char *argv[])
{
int level;
int level, ret;
if (check_int(fd, &level, argv[1], need_integer) < 0)
return -1;
return changeVolumeLevel(fd, level, 0);
ret = changeVolumeLevel(level, 0);
if (ret == -1)
commandError(fd, ACK_ERROR_SYSTEM,
"problems setting volume");
return ret;
}
static int handleRepeat(int fd, mpd_unused int *permission,