diff --git a/NEWS b/NEWS index 168c3dc48..7bd079870 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ ver 0.16 (20??/??/??) * protocol: - send song modification time to client - added "update" idle event + - removed the deprecated "volume" command * decoders: - ffmpeg: support multiple tags * mixers: diff --git a/doc/protocol.xml b/doc/protocol.xml index 6b2ff587f..35ea39d8e 100644 --- a/doc/protocol.xml +++ b/doc/protocol.xml @@ -472,25 +472,6 @@ - - - - volume - CHANGE - - - - - Changes volume by amount CHANGE. - - - - volume is deprecated, use - setvol instead. - - - - diff --git a/src/command.c b/src/command.c index 5b2973d3e..7f4444cfb 100644 --- a/src/command.c +++ b/src/command.c @@ -58,7 +58,6 @@ #include #include -#define COMMAND_STATUS_VOLUME "volume" #define COMMAND_STATUS_STATE "state" #define COMMAND_STATUS_REPEAT "repeat" #define COMMAND_STATUS_SINGLE "single" @@ -470,7 +469,7 @@ handle_status(struct client *client, } client_printf(client, - COMMAND_STATUS_VOLUME ": %i\n" + "volume: %i\n" COMMAND_STATUS_REPEAT ": %i\n" COMMAND_STATUS_RANDOM ": %i\n" COMMAND_STATUS_SINGLE ": %i\n" @@ -1053,25 +1052,6 @@ handle_listall(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) return ret; } -static enum command_return -handle_volume(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) -{ - int change; - bool success; - - if (!check_int(client, &change, argv[1], need_integer)) - return COMMAND_RETURN_ERROR; - - success = volume_level_change(change, true); - if (!success) { - command_error(client, ACK_ERROR_SYSTEM, - "problems setting volume"); - return COMMAND_RETURN_ERROR; - } - - return COMMAND_RETURN_OK; -} - static enum command_return handle_setvol(struct client *client, G_GNUC_UNUSED int argc, char *argv[]) { @@ -1740,7 +1720,6 @@ static const struct command commands[] = { { "tagtypes", PERMISSION_READ, 0, 0, handle_tagtypes }, { "update", PERMISSION_ADMIN, 0, 1, handle_update }, { "urlhandlers", PERMISSION_READ, 0, 0, handle_urlhandlers }, - { "volume", PERMISSION_CONTROL, 1, 1, handle_volume }, }; static const unsigned num_commands = sizeof(commands) / sizeof(commands[0]);