X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=alsa_write.c;h=16497bdf222d8b16c155fe41ab22999bc60f366e;hp=8c12c728e551035bd8eca071216e3c7e44060de5;hb=ca138ffebb5ccab9b3fedc1234a9c5ba33bb4bb0;hpb=c4bfb18b78b3935b8dbf68f70b219cfb2a192979

diff --git a/alsa_write.c b/alsa_write.c
index 8c12c728..16497bdf 100644
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -324,22 +324,22 @@ again:
 	ret = -E_ALSA;
 err:
 	assert(ret < 0);
-	btr_remove_node(btrn);
+	btr_remove_node(&wn->btrn);
 	t->error = ret;
 }
 
-__malloc static void *alsa_parse_config_or_die(const char *options)
+__malloc static void *alsa_parse_config_or_die(int argc, char **argv)
 {
 	struct alsa_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	alsa_cmdline_parser_string(options, conf, "alsa_write");
+	alsa_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void alsa_free_config(void *conf)
 {
-	alsa_cmdline_parser_free(conf);
+	alsa_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -353,7 +353,7 @@ void alsa_write_init(struct writer *w)
 {
 	struct alsa_write_args_info dummy;
 
-	alsa_cmdline_parser_init(&dummy);
+	alsa_write_cmdline_parser_init(&dummy);
 	w->close = alsa_close;
 	w->pre_select = alsa_write_pre_select;
 	w->post_select = alsa_write_post_select;
@@ -363,5 +363,5 @@ void alsa_write_init(struct writer *w)
 		.short_help = alsa_write_args_info_help,
 		.detailed_help = alsa_write_args_info_detailed_help
 	};
-	alsa_cmdline_parser_free(&dummy);
+	alsa_write_cmdline_parser_free(&dummy);
 }