From: Andre Noll <maan@tuebingen.mpg.de>
Date: Mon, 28 Mar 2016 03:48:50 +0000 (+0000)
Subject: play: Convert com_info() to lopsub.
X-Git-Tag: v0.6.0~2^2~43
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=027c1496fd09abafb1c1f4f81cc7fa9e23776394

play: Convert com_info() to lopsub.

This also improves the help text slightly to be more specific about
the output of the subcommand.
---

diff --git a/m4/lls/play_cmd.suite.m4 b/m4/lls/play_cmd.suite.m4
index 1c71e71e..f1434aff 100644
--- a/m4/lls/play_cmd.suite.m4
+++ b/m4/lls/play_cmd.suite.m4
@@ -54,3 +54,10 @@ caption = list of commands
 		This prints all paths of the playlist. The currently
 		active file is marked with an asterisk.
 	[/description]
+
+[subcommand info]
+	purpose = print information about the current file
+	[description]
+		The output contains the playlist position, the path
+		and information provided by the audio format handler.
+	[/description]
diff --git a/play.c b/play.c
index 1c1d809a..1700f9ac 100644
--- a/play.c
+++ b/play.c
@@ -793,14 +793,13 @@ static int com_help(struct play_task *pt, struct lls_parse_result *lpr)
 }
 EXPORT_PLAY_CMD_HANDLER(help);
 
-static int com_info(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_info(struct play_task *pt,
+		__a_unused struct lls_parse_result *lpr)
 {
 	char *buf;
 	size_t sz;
 	static char dflt[] = "[no information available]";
 
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	sz = xasprintf(&buf, "playlist_pos: %u\npath: %s\n",
 		pt->current_file, conf.inputs[pt->current_file]);
 	btr_add_output(buf, sz, pt->btrn);
@@ -808,6 +807,7 @@ static int com_info(struct play_task *pt, int argc, __a_unused char **argv)
 	btr_add_output_dont_free(buf, strlen(buf), pt->btrn);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(info);
 
 static void list_file(struct play_task *pt, int num)
 {
diff --git a/play.cmd b/play.cmd
index 799abbfd..16cec2aa 100644
--- a/play.cmd
+++ b/play.cmd
@@ -2,11 +2,6 @@ BN: play
 SF: play.c
 SN: list of commands
 ---
-N: info
-D: Print information about the current file.
-U: info
-H: This is the audio file selector info.
----
 N: play
 D: Start or resume playing.
 U: play [<num>]