X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=play.c;h=1ab4010160cac7e22988111d361de5e745dcd75c;hb=89633512b2bfe6b903341fb12bfab65510ef0e9d;hp=996734f4b3138fe71bc3c5c4fd42e8ce4f766849;hpb=575aa063581ddfae4af105cea6066c165e9faf1d;p=paraslash.git

diff --git a/play.c b/play.c
index 996734f4..1ab40101 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>
@@ -666,23 +665,6 @@ static char **get_mapped_keyseqs(void)
 	return result;
 }
 
-#include "play.command_list.h"
-
-typedef int play_command_handler_t(struct play_task *, int, char**);
-static play_command_handler_t PLAY_COMMAND_HANDLERS;
-
-/* defines one command of para_play */
-struct pp_command {
-	const char *name;
-	play_command_handler_t *handler;
-	const char *description;
-	const char *usage;
-	const char *help;
-};
-
-static struct pp_command pp_cmds[] = {DEFINE_PLAY_CMD_ARRAY};
-#define FOR_EACH_COMMAND(c) for (c = 0; pp_cmds[c].name; c++)
-
 static struct i9e_completer pp_completers[];
 
 I9E_DUMMY_COMPLETER(jmp);
@@ -728,13 +710,13 @@ static void detach_stdout(struct play_task *pt)
 	btr_remove_node(&pt->btrn);
 }
 
-static int com_quit(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_quit(struct play_task *pt,
+		__a_unused struct lls_parse_result *lpr)
 {
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	pt->rq = CRT_TERM_RQ;
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(quit);
 
 static int com_help(struct play_task *pt, struct lls_parse_result *lpr)
 {
@@ -757,11 +739,6 @@ static int com_help(struct play_task *pt, struct lls_parse_result *lpr)
 					lls_command_name(cmd), lls_purpose(cmd));
 				btr_add_output(buf, sz, pt->btrn);
 			}
-			FOR_EACH_COMMAND(i) {
-				sz = xasprintf(&buf, "%s\t%s\n", pp_cmds[i].name,
-				pp_cmds[i].description);
-				btr_add_output(buf, sz, pt->btrn);
-			}
 			return 0;
 		}
 		FOR_EACH_MAPPED_KEY(i) {
@@ -794,14 +771,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);
@@ -809,6 +785,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)
 {
@@ -820,15 +797,13 @@ static void list_file(struct play_task *pt, int num)
 	btr_add_output(buf, sz, pt->btrn);
 }
 
-static int com_tasks(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_tasks(struct play_task *pt,
+		__a_unused struct lls_parse_result *lpr)
 {
 	static char state;
 	char *buf;
 	size_t sz;
 
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
-
 	buf = get_task_list(&sched);
 	btr_add_output(buf, strlen(buf), pt->btrn);
 	state = get_playback_state(pt);
@@ -836,36 +811,34 @@ static int com_tasks(struct play_task *pt, int argc, __a_unused char **argv)
 	btr_add_output(buf, sz, pt->btrn);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(tasks);
 
-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)
+static int com_play(struct play_task *pt, struct lls_parse_result *lpr)
 {
 	int32_t x;
 	int ret;
-	char state;
+	char state, *errctx;
 
-	if (argc > 2)
-		return -E_PLAY_SYNTAX;
+	ret = lls(lls_check_arg_count(lpr, 0, 1, &errctx));
+	if (ret < 0) {
+		if (errctx)
+			PARA_ERROR_LOG("%s\n", errctx);
+		free(errctx);
+		return ret;
+	}
 	state = get_playback_state(pt);
-	if (argc == 1) {
+	if (lls_num_inputs(lpr) == 0) {
 		if (state == 'P')
 			return 0;
 		pt->next_file = pt->current_file;
@@ -873,7 +846,7 @@ static int com_play(struct play_task *pt, int argc, char **argv)
 		pt->playing = true;
 		return 0;
 	}
-	ret = para_atoi32(argv[1], &x);
+	ret = para_atoi32(lls_input(0, lpr), &x);
 	if (ret < 0)
 		return ret;
 	if (x < 0 || x >= conf.inputs_num)
@@ -883,14 +856,14 @@ static int com_play(struct play_task *pt, int argc, char **argv)
 	pt->rq = CRT_FILE_CHANGE;
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(play);
 
-static int com_pause(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_pause(struct play_task *pt,
+		__a_unused struct lls_parse_result *lpr)
 {
 	char state;
 	long unsigned seconds, ss;
 
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	state = get_playback_state(pt);
 	pt->playing = false;
 	if (state != 'P')
@@ -906,14 +879,13 @@ static int com_pause(struct play_task *pt, int argc, __a_unused char **argv)
 	kill_stream(pt);
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(pause);
 
-static int com_prev(struct play_task *pt, int argc, __a_unused char **argv)
-
+static int com_prev(struct play_task *pt,
+	__a_unused struct lls_parse_result *lpr)
 {
 	int ret;
 
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	ret = previous_valid_file(pt);
 	if (ret < 0)
 		return ret;
@@ -923,13 +895,13 @@ static int com_prev(struct play_task *pt, int argc, __a_unused char **argv)
 	pt->start_chunk = 0;
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(prev);
 
-static int com_next(struct play_task *pt, int argc, __a_unused char **argv)
+static int com_next(struct play_task *pt,
+		__a_unused struct lls_parse_result *lpr)
 {
 	int ret;
 
-	if (argc != 1)
-		return -E_PLAY_SYNTAX;
 	ret = next_valid_file(pt);
 	if (ret < 0)
 		return ret;
@@ -939,6 +911,7 @@ static int com_next(struct play_task *pt, int argc, __a_unused char **argv)
 	pt->start_chunk = 0;
 	return 0;
 }
+EXPORT_PLAY_CMD_HANDLER(next);
 
 static int com_fg(struct play_task *pt,
 		__a_unused struct lls_parse_result *lpr)
@@ -948,28 +921,34 @@ 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)
 		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (percent == 100)
-		return com_next(pt, 1, (char *[]){"next", NULL});
+		return com_next(pt, NULL);
 	if (pt->playing && !pt->fn.btrn)
 		return 0;
 	pt->start_chunk = percent * pt->num_chunks / 100;
@@ -979,15 +958,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)
@@ -1004,10 +990,11 @@ 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)
 {
-	int i, ret, argc;
+	int ret, argc;
 	char **argv = NULL;
 	char *errctx = NULL;
 	const struct play_command_info *pci;
@@ -1021,26 +1008,16 @@ static int run_command(char *line, struct play_task *pt)
 	if (ret == 0)
 		goto out;
 	argc = ret;
-
 	ret = lls(lls_lookup_subcmd(argv[0], play_cmd_suite, &errctx));
-	if (ret >= 0) {
-		cmd = lls_cmd(ret, play_cmd_suite);
-		ret = lls(lls_parse(argc, argv, cmd, &lpr, &errctx));
-		if (ret < 0)
-			goto out;
-		pci = lls_user_data(cmd);
-		ret = pci->handler(pt, lpr);
-		lls_free_parse_result(lpr, cmd);
-	} else {
-		FOR_EACH_COMMAND(i) {
-			if (strcmp(pp_cmds[i].name, argv[0]))
-				continue;
-			free(errctx);
-			errctx = NULL;
-			ret = pp_cmds[i].handler(pt, argc, argv);
-			break;
-		}
-	}
+	if (ret < 0)
+		goto out;
+	cmd = lls_cmd(ret, play_cmd_suite);
+	ret = lls(lls_parse(argc, argv, cmd, &lpr, &errctx));
+	if (ret < 0)
+		goto out;
+	pci = lls_user_data(cmd);
+	ret = pci->handler(pt, lpr);
+	lls_free_parse_result(lpr, cmd);
 out:
 	if (errctx)
 		PARA_ERROR_LOG("%s\n", errctx);