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

protocol/ArgParser: add overload with max_value parameter

Browse Source
This commit is contained in:
Max Kellermann
2015-08-11 22:57:06 +02:00
parent ee61dfe087
commit e118e958f7
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/command/OtherCommands.cxx
View File

@@ -309,14 +309,9 @@ CommandResult
handle_setvol(Client &client, Request args)
{
unsigned level;
if (!ParseCommandArg(client, level, args.front()))
if (!ParseCommandArg(client, level, args.front(), 100))
return CommandResult::ERROR;
if (level > 100) {
command_error(client, ACK_ERROR_ARG, "Invalid volume value");
return CommandResult::ERROR;
}
if (!volume_level_change(client.partition.outputs, level)) {
command_error(client, ACK_ERROR_SYSTEM,
"problems setting volume");
@@ -330,14 +325,9 @@ CommandResult
handle_volume(Client &client, Request args)
{
int relative;
if (!ParseCommandArg(client, relative, args.front()))
if (!ParseCommandArg(client, relative, args.front(), -100, 100))
return CommandResult::ERROR;
if (relative < -100 || relative > 100) {
command_error(client, ACK_ERROR_ARG, "Invalid volume value");
return CommandResult::ERROR;
}
const int old_volume = volume_level_get(client.partition.outputs);
if (old_volume < 0) {
command_error(client, ACK_ERROR_SYSTEM, "No mixer");