X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=5f4acb4364abe09ecc77923d37e378bbd6b57791;hp=56ab0c9a0c86608a8b78909f40794b62ac99bcbf;hb=4adde8dae3317fa83b81e7a860c9ed9133e99bb0;hpb=44779382f0699be6b8daeeb25e7e1a2c40116d4b

diff --git a/audiod.c b/audiod.c
index 56ab0c9a..5f4acb43 100644
--- a/audiod.c
+++ b/audiod.c
@@ -60,6 +60,8 @@ struct audio_format_info {
 	unsigned *filter_nums;
 	/** Pointer to the array of filter configurations. */
 	void **filter_conf;
+	/** Parsed filter command line, one parse result per filter. */
+	struct lls_parse_result **filter_lpr;
 	/** the number of filters that should be activated for this audio format */
 	unsigned int num_writers;
 	/** Array of writer numbers to be activated. */
@@ -592,17 +594,20 @@ static void open_filters(struct slot_info *s)
 	parent = s->receiver_node->btrn;
 	for (i = 0; i < nf; i++) {
 		char buf[20];
+		const char *name;
 		const struct filter *f = filter_get(a->filter_nums[i]);
 		fn = s->fns + i;
 		fn->filter_num = a->filter_nums[i];
 		fn->conf = a->filter_conf[i];
+		fn->lpr = a->filter_lpr[i];
+		name = filter_name(fn->filter_num);
 		fn->btrn = btr_new_node(&(struct btr_node_description)
-			EMBRACE(.name = f->name, .parent = parent,
+			EMBRACE(.name = name, .parent = parent,
 				.handler = f->execute, .context = fn));
 
 		if (f->open)
 			f->open(fn);
-		sprintf(buf, "%s (slot %d)", f->name, (int)(s - slot));
+		sprintf(buf, "%s (slot %d)", name, (int)(s - slot));
 		fn->task = task_register(&(struct task_info) {
 			.name = buf,
 			.pre_select = f->pre_select,
@@ -611,7 +616,7 @@ static void open_filters(struct slot_info *s)
 		}, &sched);
 		parent = fn->btrn;
 		PARA_NOTICE_LOG("%s filter %d/%d (%s) started in slot %d\n",
-			audio_formats[s->format], i,  nf, f->name, (int)(s - slot));
+			audio_formats[s->format], i,  nf, name, (int)(s - slot));
 	}
 }
 
@@ -852,19 +857,22 @@ static int add_filter(int format, const char *cmdline)
 	struct audio_format_info *a = &afi[format];
 	int filter_num, nf = a->num_filters;
 	void *cfg;
+	struct lls_parse_result *flpr;
 
-	filter_num = check_filter_arg(cmdline, &cfg);
-	if (filter_num < 0)
-		return filter_num;
+	filter_num = filter_setup(cmdline, &cfg, &flpr);
+	a->filter_lpr = para_realloc(a->filter_lpr,
+		(nf + 1) * sizeof(flpr));
 	a->filter_conf = para_realloc(a->filter_conf,
 		(nf + 1) * sizeof(void *));
 	a->filter_nums = para_realloc(a->filter_nums,
 		(nf + 1) * sizeof(unsigned));
+
 	a->filter_nums[nf] = filter_num;
 	a->filter_conf[nf] = cfg;
+	a->filter_lpr[nf] = flpr;
 	a->num_filters++;
 	PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf,
-		filter_get(filter_num)->name);
+		filter_name(filter_num));
 	return filter_num;
 }
 
@@ -991,19 +999,19 @@ static int init_default_filters(void)
 		/* add "dec" to audio format name */
 		tmp = make_message("%sdec", audio_formats[i]);
 		for (j = 0; filter_get(j); j++)
-			if (!strcmp(tmp, filter_get(j)->name))
+			if (!strcmp(tmp, filter_name(j)))
 				break;
 		free(tmp);
 		ret = -E_UNSUPPORTED_FILTER;
 		if (!filter_get(j))
 			goto out;
-		tmp = para_strdup(filter_get(j)->name);
+		tmp = para_strdup(filter_name(j));
 		ret = add_filter(i, tmp);
 		free(tmp);
 		if (ret < 0)
 			goto out;
 		PARA_INFO_LOG("%s -> default filter: %s\n", audio_formats[i],
-			filter_get(j)->name);
+			filter_name(j));
 	}
 out:
 	return ret;
@@ -1496,7 +1504,6 @@ int main(int argc, char *argv[])
 	version_handle_flag("audiod", conf.version_given);
 	/* init receivers/filters/writers early to make help work */
 	recv_init();
-	filter_init();
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();