1 files changed, 106 insertions, 126 deletions

diff --git a/src/command/PlayerCommands.cxx b/src/command/PlayerCommands.cxx
index cd7f42289..11cde2e98 100644
--- a/src/command/PlayerCommands.cxx
+++ b/src/command/PlayerCommands.cxx
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2014 The Music Player Daemon Project
+ * Copyright (C) 2003-2015 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -19,17 +19,18 @@
 
 #include "config.h"
 #include "PlayerCommands.hxx"
+#include "Request.hxx"
 #include "CommandError.hxx"
 #include "queue/Playlist.hxx"
 #include "PlaylistPrint.hxx"
 #include "client/Client.hxx"
+#include "client/Response.hxx"
 #include "mixer/Volume.hxx"
 #include "Partition.hxx"
 #include "Instance.hxx"
-#include "protocol/Result.hxx"
-#include "protocol/ArgParser.hxx"
 #include "AudioFormat.hxx"
 #include "ReplayGainConfig.hxx"
+#include "util/ConstBuffer.hxx"
 
 #ifdef ENABLE_DATABASE
 #include "db/update/Service.hxx"
@@ -56,51 +57,47 @@
 #define COMMAND_STATUS_UPDATING_DB	"updating_db"
 
 CommandResult
-handle_play(Client &client, unsigned argc, char *argv[])
+handle_play(Client &client, Request args, Response &r)
 {
 	int song = -1;
-
-	if (argc == 2 && !check_int(client, &song, argv[1]))
+	if (!args.ParseOptional(0, song, r))
 		return CommandResult::ERROR;
+
 	PlaylistResult result = client.partition.PlayPosition(song);
-	return print_playlist_result(client, result);
+	return print_playlist_result(r, result);
 }
 
 CommandResult
-handle_playid(Client &client, unsigned argc, char *argv[])
+handle_playid(Client &client, Request args, Response &r)
 {
 	int id = -1;
-
-	if (argc == 2 && !check_int(client, &id, argv[1]))
+	if (!args.ParseOptional(0, id, r))
 		return CommandResult::ERROR;
 
 	PlaylistResult result = client.partition.PlayId(id);
-	return print_playlist_result(client, result);
+	return print_playlist_result(r, result);
 }
 
 CommandResult
-handle_stop(Client &client,
-	    gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_stop(Client &client, gcc_unused Request args, gcc_unused Response &r)
 {
 	client.partition.Stop();
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_currentsong(Client &client,
-		   gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_currentsong(Client &client, gcc_unused Request args, Response &r)
 {
-	playlist_print_current(client, client.playlist);
+	playlist_print_current(r, client.partition, client.playlist);
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_pause(Client &client,
-	     unsigned argc, char *argv[])
+handle_pause(Client &client, Request args, Response &r)
 {
-	if (argc == 2) {
+	if (!args.IsEmpty()) {
 		bool pause_flag;
-		if (!check_bool(client, &pause_flag, argv[1]))
+		if (!args.Parse(0, pause_flag, r))
 			return CommandResult::ERROR;
 
 		client.player_control.SetPause(pause_flag);
@@ -111,8 +108,7 @@ handle_pause(Client &client,
 }
 
 CommandResult
-handle_status(Client &client,
-	      gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_status(Client &client, gcc_unused Request args, Response &r)
 {
 	const char *state = nullptr;
 	int song;
@@ -132,63 +128,61 @@ handle_status(Client &client,
 	}
 
 	const playlist &playlist = client.playlist;
-	client_printf(client,
-		      "volume: %i\n"
-		      COMMAND_STATUS_REPEAT ": %i\n"
-		      COMMAND_STATUS_RANDOM ": %i\n"
-		      COMMAND_STATUS_SINGLE ": %i\n"
-		      COMMAND_STATUS_CONSUME ": %i\n"
-		      COMMAND_STATUS_PLAYLIST ": %li\n"
-		      COMMAND_STATUS_PLAYLIST_LENGTH ": %i\n"
-		      COMMAND_STATUS_MIXRAMPDB ": %f\n"
-		      COMMAND_STATUS_STATE ": %s\n",
-		      volume_level_get(client.partition.outputs),
-		      playlist.GetRepeat(),
-		      playlist.GetRandom(),
-		      playlist.GetSingle(),
-		      playlist.GetConsume(),
-		      (unsigned long)playlist.GetVersion(),
-		      playlist.GetLength(),
-		      client.player_control.GetMixRampDb(),
-		      state);
+	r.Format("volume: %i\n"
+		 COMMAND_STATUS_REPEAT ": %i\n"
+		 COMMAND_STATUS_RANDOM ": %i\n"
+		 COMMAND_STATUS_SINGLE ": %i\n"
+		 COMMAND_STATUS_CONSUME ": %i\n"
+		 COMMAND_STATUS_PLAYLIST ": %li\n"
+		 COMMAND_STATUS_PLAYLIST_LENGTH ": %i\n"
+		 COMMAND_STATUS_MIXRAMPDB ": %f\n"
+		 COMMAND_STATUS_STATE ": %s\n",
+		 volume_level_get(client.partition.outputs),
+		 playlist.GetRepeat(),
+		 playlist.GetRandom(),
+		 playlist.GetSingle(),
+		 playlist.GetConsume(),
+		 (unsigned long)playlist.GetVersion(),
+		 playlist.GetLength(),
+		 client.player_control.GetMixRampDb(),
+		 state);
 
 	if (client.player_control.GetCrossFade() > 0)
-		client_printf(client,
-			      COMMAND_STATUS_CROSSFADE ": %i\n",
-			      int(client.player_control.GetCrossFade() + 0.5));
+		r.Format(COMMAND_STATUS_CROSSFADE ": %i\n",
+			 int(client.player_control.GetCrossFade() + 0.5));
 
 	if (client.player_control.GetMixRampDelay() > 0)
-		client_printf(client,
-			      COMMAND_STATUS_MIXRAMPDELAY ": %f\n",
-			      client.player_control.GetMixRampDelay());
+		r.Format(COMMAND_STATUS_MIXRAMPDELAY ": %f\n",
+			 client.player_control.GetMixRampDelay());
 
 	song = playlist.GetCurrentPosition();
 	if (song >= 0) {
-		client_printf(client,
-			      COMMAND_STATUS_SONG ": %i\n"
-			      COMMAND_STATUS_SONGID ": %u\n",
-			      song, playlist.PositionToId(song));
+		r.Format(COMMAND_STATUS_SONG ": %i\n"
+			 COMMAND_STATUS_SONGID ": %u\n",
+			 song, playlist.PositionToId(song));
 	}
 
 	if (player_status.state != PlayerState::STOP) {
-		client_printf(client,
-			      COMMAND_STATUS_TIME ": %i:%i\n"
-			      "elapsed: %1.3f\n"
-			      COMMAND_STATUS_BITRATE ": %u\n",
-			      player_status.elapsed_time.RoundS(),
-			      player_status.total_time.IsNegative()
-			      ? 0u
-			      : unsigned(player_status.total_time.RoundS()),
-			      player_status.elapsed_time.ToDoubleS(),
-			      player_status.bit_rate);
+		r.Format(COMMAND_STATUS_TIME ": %i:%i\n"
+			 "elapsed: %1.3f\n"
+			 COMMAND_STATUS_BITRATE ": %u\n",
+			 player_status.elapsed_time.RoundS(),
+			 player_status.total_time.IsNegative()
+			 ? 0u
+			 : unsigned(player_status.total_time.RoundS()),
+			 player_status.elapsed_time.ToDoubleS(),
+			 player_status.bit_rate);
+
+		if (!player_status.total_time.IsNegative())
+			r.Format("duration: %1.3f\n",
+				 player_status.total_time.ToDoubleS());
 
 		if (player_status.audio_format.IsDefined()) {
 			struct audio_format_string af_string;
 
-			client_printf(client,
-				      COMMAND_STATUS_AUDIO ": %s\n",
-				      audio_format_to_string(player_status.audio_format,
-							     &af_string));
+			r.Format(COMMAND_STATUS_AUDIO ": %s\n",
+				 audio_format_to_string(player_status.audio_format,
+							&af_string));
 		}
 	}
 
@@ -198,32 +192,27 @@ handle_status(Client &client,
 		? update_service->GetId()
 		: 0;
 	if (updateJobId != 0) {
-		client_printf(client,
-			      COMMAND_STATUS_UPDATING_DB ": %i\n",
-			      updateJobId);
+		r.Format(COMMAND_STATUS_UPDATING_DB ": %i\n",
+			 updateJobId);
 	}
 #endif
 
 	Error error = client.player_control.LockGetError();
 	if (error.IsDefined())
-		client_printf(client,
-			      COMMAND_STATUS_ERROR ": %s\n",
-			      error.GetMessage());
+		r.Format(COMMAND_STATUS_ERROR ": %s\n",
+			 error.GetMessage());
 
 	song = playlist.GetNextPosition();
-	if (song >= 0) {
-		client_printf(client,
-			      COMMAND_STATUS_NEXTSONG ": %i\n"
-			      COMMAND_STATUS_NEXTSONGID ": %u\n",
-			      song, playlist.PositionToId(song));
-	}
+	if (song >= 0)
+		r.Format(COMMAND_STATUS_NEXTSONG ": %i\n"
+			 COMMAND_STATUS_NEXTSONGID ": %u\n",
+			 song, playlist.PositionToId(song));
 
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_next(Client &client,
-	    gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_next(Client &client, gcc_unused Request args, gcc_unused Response &r)
 {
 	playlist &playlist = client.playlist;
 
@@ -239,18 +228,18 @@ handle_next(Client &client,
 }
 
 CommandResult
-handle_previous(Client &client,
-		gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_previous(Client &client, gcc_unused Request args,
+		gcc_unused Response &r)
 {
 	client.partition.PlayPrevious();
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_repeat(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_repeat(Client &client, Request args, Response &r)
 {
 	bool status;
-	if (!check_bool(client, &status, argv[1]))
+	if (!args.Parse(0, status, r))
 		return CommandResult::ERROR;
 
 	client.partition.SetRepeat(status);
@@ -258,10 +247,10 @@ handle_repeat(Client &client, gcc_unused unsigned argc, char *argv[])
 }
 
 CommandResult
-handle_single(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_single(Client &client, Request args, Response &r)
 {
 	bool status;
-	if (!check_bool(client, &status, argv[1]))
+	if (!args.Parse(0, status, r))
 		return CommandResult::ERROR;
 
 	client.partition.SetSingle(status);
@@ -269,10 +258,10 @@ handle_single(Client &client, gcc_unused unsigned argc, char *argv[])
 }
 
 CommandResult
-handle_consume(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_consume(Client &client, Request args, Response &r)
 {
 	bool status;
-	if (!check_bool(client, &status, argv[1]))
+	if (!args.Parse(0, status, r))
 		return CommandResult::ERROR;
 
 	client.partition.SetConsume(status);
@@ -280,10 +269,10 @@ handle_consume(Client &client, gcc_unused unsigned argc, char *argv[])
 }
 
 CommandResult
-handle_random(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_random(Client &client, Request args, Response &r)
 {
 	bool status;
-	if (!check_bool(client, &status, argv[1]))
+	if (!args.Parse(0, status, r))
 		return CommandResult::ERROR;
 
 	client.partition.SetRandom(status);
@@ -292,102 +281,94 @@ handle_random(Client &client, gcc_unused unsigned argc, char *argv[])
 }
 
 CommandResult
-handle_clearerror(gcc_unused Client &client,
-		  gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_clearerror(Client &client, gcc_unused Request args,
+		  gcc_unused Response &r)
 {
 	client.player_control.ClearError();
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_seek(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_seek(Client &client, Request args, Response &r)
 {
 	unsigned song;
 	SongTime seek_time;
-
-	if (!check_unsigned(client, &song, argv[1]))
-		return CommandResult::ERROR;
-	if (!ParseCommandArg(client, seek_time, argv[2]))
+	if (!args.Parse(0, song, r) || !args.Parse(1, seek_time, r))
 		return CommandResult::ERROR;
 
 	PlaylistResult result =
 		client.partition.SeekSongPosition(song, seek_time);
-	return print_playlist_result(client, result);
+	return print_playlist_result(r, result);
 }
 
 CommandResult
-handle_seekid(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_seekid(Client &client, Request args, Response &r)
 {
 	unsigned id;
 	SongTime seek_time;
-
-	if (!check_unsigned(client, &id, argv[1]))
+	if (!args.Parse(0, id, r))
 		return CommandResult::ERROR;
-	if (!ParseCommandArg(client, seek_time, argv[2]))
+	if (!args.Parse(1, seek_time, r))
 		return CommandResult::ERROR;
 
 	PlaylistResult result =
 		client.partition.SeekSongId(id, seek_time);
-	return print_playlist_result(client, result);
+	return print_playlist_result(r, result);
 }
 
 CommandResult
-handle_seekcur(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_seekcur(Client &client, Request args, Response &r)
 {
-	const char *p = argv[1];
+	const char *p = args.front();
 	bool relative = *p == '+' || *p == '-';
 	SignedSongTime seek_time;
-	if (!ParseCommandArg(client, seek_time, p))
+	if (!ParseCommandArg(r, seek_time, p))
 		return CommandResult::ERROR;
 
 	PlaylistResult result =
 		client.partition.SeekCurrent(seek_time, relative);
-	return print_playlist_result(client, result);
+	return print_playlist_result(r, result);
 }
 
 CommandResult
-handle_crossfade(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_crossfade(Client &client, Request args, Response &r)
 {
 	unsigned xfade_time;
-
-	if (!check_unsigned(client, &xfade_time, argv[1]))
+	if (!args.Parse(0, xfade_time, r))
 		return CommandResult::ERROR;
-	client.player_control.SetCrossFade(xfade_time);
 
+	client.player_control.SetCrossFade(xfade_time);
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_mixrampdb(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_mixrampdb(Client &client, Request args, Response &r)
 {
 	float db;
-
-	if (!check_float(client, &db, argv[1]))
+	if (!args.Parse(0, db, r))
 		return CommandResult::ERROR;
-	client.player_control.SetMixRampDb(db);
 
+	client.player_control.SetMixRampDb(db);
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_mixrampdelay(Client &client, gcc_unused unsigned argc, char *argv[])
+handle_mixrampdelay(Client &client, Request args, Response &r)
 {
 	float delay_secs;
-
-	if (!check_float(client, &delay_secs, argv[1]))
+	if (!args.Parse(0, delay_secs, r))
 		return CommandResult::ERROR;
+
 	client.player_control.SetMixRampDelay(delay_secs);
 
 	return CommandResult::OK;
 }
 
 CommandResult
-handle_replay_gain_mode(Client &client,
-			gcc_unused unsigned argc, char *argv[])
+handle_replay_gain_mode(Client &client, Request args, Response &r)
 {
-	if (!replay_gain_set_mode_string(argv[1])) {
-		command_error(client, ACK_ERROR_ARG,
-			      "Unrecognized replay gain mode");
+	if (!replay_gain_set_mode_string(args.front())) {
+		r.Error(ACK_ERROR_ARG, "Unrecognized replay gain mode");
 		return CommandResult::ERROR;
 	}
 
@@ -396,10 +377,9 @@ handle_replay_gain_mode(Client &client,
 }
 
 CommandResult
-handle_replay_gain_status(Client &client,
-			  gcc_unused unsigned argc, gcc_unused char *argv[])
+handle_replay_gain_status(gcc_unused Client &client, gcc_unused Request args,
+			  Response &r)
 {
-	client_printf(client, "replay_gain_mode: %s\n",
-		      replay_gain_get_mode_string());
+	r.Format("replay_gain_mode: %s\n", replay_gain_get_mode_string());
 	return CommandResult::OK;
 }