X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=grab_client.c;h=e81ad992733b8d0fad16ded17694891513875713;hp=f853a76432b65e597cf987f5a00a468b5bffff7f;hb=a041c8f444140dca47109371c4ede6b32b33be60;hpb=69f0930489da9ace5af8aee104ad21d188aed387

diff --git a/grab_client.c b/grab_client.c
index f853a764..e81ad992 100644
--- a/grab_client.c
+++ b/grab_client.c
@@ -43,7 +43,7 @@ static int max_num_filters(void)
 	for (i = 0; audio_formats[i]; i++) {
 		PARA_INFO_LOG("%s filter chain length: %d\n", audio_formats[i],
 			num_filters(i));
-		ret = MAX(ret, num_filters(i));
+		ret = PARA_MAX(ret, num_filters(i));
 	}
 	PARA_INFO_LOG("maximal filter chain length: %d\n", ret);
 	return ret;
@@ -85,6 +85,7 @@ rewrite:
 	return ret;
 }
 
+/* TODO: gengetopt can handle the grab client modes */
 static int check_gc_args(struct grab_client *gc)
 {
 	int i;
@@ -95,7 +96,10 @@ static int check_gc_args(struct grab_client *gc)
 	for (i = 0; mv[i]; i++)
 		if (!strcmp(conf->mode_arg, mv[i]))
 			break;
+	if (!mv[i])
+		return -E_GC_SYNTAX;
 	gc->mode = i;
+	gc->audio_format_num = -1;
 	if (conf->audio_format_given) {
 		gc->audio_format_num = get_audio_format_num(conf->audio_format_arg);
 		if (gc->audio_format_num < 0)
@@ -231,20 +235,14 @@ void activate_inactive_grab_clients(int slot, int audio_format_num,
  * argc, argv get freed when com_grab() returns, so we have to make a
  * copy.
  */
-struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
+struct grab_client *grab_client_new(int fd, char *line, int *err)
 {
-	int i, ret;
+	int ret;
 	struct grab_client *gc = para_calloc(sizeof(struct grab_client));
 
 	gc->conf = para_calloc(sizeof(struct grab_client_args_info));
-	gc->argc = argc;
-	gc->argv = para_calloc((argc + 2) * sizeof(char *));
 
-	for (i = 0; argv[i]; i++) {
-		gc->argv[i] = para_strdup(argv[i]);
-		PARA_INFO_LOG("argc: %d, argv[%d]: %s\n", argc, i, gc->argv[i]);
-	}
-	ret = grab_client_cmdline_parser(gc->argc, gc->argv , gc->conf);
+	ret = grab_client_cmdline_parser_string(line, gc->conf, "grab");
 	*err = -E_GC_SYNTAX;
 	if (ret)
 		goto err_out;
@@ -270,9 +268,6 @@ struct grab_client *grab_client_new(int fd, int argc, char **argv, int *err)
 	add_inactive_gc(gc);
 	return gc;
 err_out:
-	for (i = 0; i < argc; i++)
-		free(gc->argv[i]);
-	free(gc->argv);
 	free(gc->conf);
 	free(gc);
 	return NULL;