diff options
Diffstat (limited to 'src/command/OtherCommands.cxx')
| -rw-r--r-- | src/command/OtherCommands.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/command/OtherCommands.cxx b/src/command/OtherCommands.cxx index 4fc7e56f6..816764a5d 100644 --- a/src/command/OtherCommands.cxx +++ b/src/command/OtherCommands.cxx @@ -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"); |