From cf4d80fc655a399615529bdd27e0be284754c5ab Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 20 Oct 2013 13:10:54 +0200 Subject: command: convert command_return to to a strictly-typed enum --- src/OutputCommands.cxx | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/OutputCommands.cxx') diff --git a/src/OutputCommands.cxx b/src/OutputCommands.cxx index ef35ba8ec..8d6ea8ed7 100644 --- a/src/OutputCommands.cxx +++ b/src/OutputCommands.cxx @@ -26,65 +26,65 @@ #include -enum command_return +CommandResult handle_enableoutput(Client &client, gcc_unused int argc, char *argv[]) { unsigned device; bool ret; if (!check_unsigned(client, &device, argv[1])) - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; ret = audio_output_enable_index(device); if (!ret) { command_error(client, ACK_ERROR_NO_EXIST, "No such audio output"); - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; } - return COMMAND_RETURN_OK; + return CommandResult::OK; } -enum command_return +CommandResult handle_disableoutput(Client &client, gcc_unused int argc, char *argv[]) { unsigned device; bool ret; if (!check_unsigned(client, &device, argv[1])) - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; ret = audio_output_disable_index(device); if (!ret) { command_error(client, ACK_ERROR_NO_EXIST, "No such audio output"); - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; } - return COMMAND_RETURN_OK; + return CommandResult::OK; } -enum command_return +CommandResult handle_toggleoutput(Client &client, gcc_unused int argc, char *argv[]) { unsigned device; if (!check_unsigned(client, &device, argv[1])) - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; if (!audio_output_toggle_index(device)) { command_error(client, ACK_ERROR_NO_EXIST, "No such audio output"); - return COMMAND_RETURN_ERROR; + return CommandResult::ERROR; } - return COMMAND_RETURN_OK; + return CommandResult::OK; } -enum command_return +CommandResult handle_devices(Client &client, gcc_unused int argc, gcc_unused char *argv[]) { printAudioDevices(client); - return COMMAND_RETURN_OK; + return CommandResult::OK; } -- cgit v1.2.3