X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=1c1d809a8cd292798fbb138dc677c6467293d39d;hp=e0ff240514fd1a575ac762acbb965cf9bdf0add9;hb=534a94f441767947874cb15d18211edf758e9277;hpb=f4c330d6693eb3da840d9f2f8210997095987956

diff --git a/play.c b/play.c
index e0ff2405..1c1d809a 100644
--- a/play.c
+++ b/play.c
@@ -7,7 +7,6 @@
 /** \file play.c Paraslash's standalone player. */
 
 #include <regex.h>
-#include <fnmatch.h>
 #include <signal.h>
 #include <inttypes.h>
 #include <lopsub.h>
@@ -837,24 +836,16 @@ static int com_tasks(struct play_task *pt, int argc, __a_unused char **argv)
 	return 0;
 }
 
-static int com_ls(struct play_task *pt, int argc, char **argv)
+static int com_ls(struct play_task *pt,
+	__a_unused struct lls_parse_result *lpr)
 {
-	int i, j, ret;
+	int i;
 
-	if (argc == 1) {
-		FOR_EACH_PLAYLIST_FILE(i)
-			list_file(pt, i);
-		return 0;
-	}
-	for (j = 1; j < argc; j++) {
-		FOR_EACH_PLAYLIST_FILE(i) {
-			ret = fnmatch(argv[j], conf.inputs[i], 0);
-			if (ret == 0) /* match */
-				list_file(pt, i);
-		}
-	}
+	FOR_EACH_PLAYLIST_FILE(i)
+		list_file(pt, i);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(ls);
 
 static int com_play(struct play_task *pt, int argc, char **argv)
 {
@@ -947,22 +938,28 @@ static int com_fg(struct play_task *pt,
 }
 EXPORT_PLAY_CMD_HANDLER(fg);
 
-static int com_bg(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_bg(struct play_task *pt,
+	__a_unused struct lls_parse_result *lpr)
 {
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	pt->background = true;
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(bg);
 
-static int com_jmp(struct play_task *pt, int argc, char **argv)
+static int com_jmp(struct play_task *pt, struct lls_parse_result *lpr)
 {
 	int32_t percent;
 	int ret;
+	char *errctx;
 
-	if (argc != 2)
-		return -E_PLAY_SYNTAX;
-	ret = para_atoi32(argv[1], &percent);
+	ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
+	if (ret < 0) {
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
+		return ret;
+	}
+	ret = para_atoi32(lls_input(0, lpr), &percent);
 	if (ret < 0)
 		return ret;
 	if (percent < 0 || percent > 100)
@@ -978,15 +975,22 @@ static int com_jmp(struct play_task *pt, int argc, char **argv)
 	kill_stream(pt);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(jmp);
 
-static int com_ff(struct play_task *pt, int argc, char **argv)
+static int com_ff(struct play_task *pt, struct lls_parse_result *lpr)
 {
 	int32_t seconds;
+	char *errctx;
 	int ret;
 
-	if (argc != 2)
-		return -E_PLAY_SYNTAX;
-	ret = para_atoi32(argv[1], &seconds);
+	ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
+	if (ret < 0) {
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
+		return ret;
+	}
+	ret = para_atoi32(lls_input(0, lpr), &seconds);
 	if (ret < 0)
 		return ret;
 	if (pt->playing && !pt->fn.btrn)
@@ -1003,6 +1007,7 @@ static int com_ff(struct play_task *pt, int argc, char **argv)
 	kill_stream(pt);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(ff);
 
 static int run_command(char *line, struct play_task *pt)
 {