From 86e036c3933def22b6ff0eae5bcf9cd7103240e7 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 13 Aug 2015 12:48:31 +0200 Subject: command: pass Response object to command callbacks --- src/command/OutputCommands.cxx | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'src/command/OutputCommands.cxx') diff --git a/src/command/OutputCommands.cxx b/src/command/OutputCommands.cxx index 472516860..7bbe5f905 100644 --- a/src/command/OutputCommands.cxx +++ b/src/command/OutputCommands.cxx @@ -28,10 +28,8 @@ #include "util/ConstBuffer.hxx" CommandResult -handle_enableoutput(Client &client, Request args) +handle_enableoutput(Client &client, Request args, Response &r) { - Response r(client); - assert(args.size == 1); unsigned device; if (!args.Parse(0, device, r)) @@ -46,10 +44,8 @@ handle_enableoutput(Client &client, Request args) } CommandResult -handle_disableoutput(Client &client, Request args) +handle_disableoutput(Client &client, Request args, Response &r) { - Response r(client); - assert(args.size == 1); unsigned device; if (!args.Parse(0, device, r)) @@ -64,10 +60,8 @@ handle_disableoutput(Client &client, Request args) } CommandResult -handle_toggleoutput(Client &client, Request args) +handle_toggleoutput(Client &client, Request args, Response &r) { - Response r(client); - assert(args.size == 1); unsigned device; if (!args.Parse(0, device, r)) @@ -82,12 +76,10 @@ handle_toggleoutput(Client &client, Request args) } CommandResult -handle_devices(Client &client, gcc_unused Request args) +handle_devices(Client &client, gcc_unused Request args, Response &r) { assert(args.IsEmpty()); - Response r(client); printAudioDevices(r, client.partition.outputs); - return CommandResult::OK; } -- cgit v1.2.3