X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=57bdcfa6b9df8b7b81c4345e6332c4add44f9399;hp=57e2387f74affad9a3608a30ff3501e8e520dfeb;hb=20e2c6a532dcb0c197062b9f97753e000eae3c6a;hpb=8fa50e3e39b4f65dea2a694dc064038a41036642

diff --git a/oss_write.c b/oss_write.c
index 57e2387f..57bdcfa6 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -164,13 +164,15 @@ static void oss_post_select(__a_unused struct sched *s,
 	struct private_oss_write_data *powd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	size_t frames, bytes;
-	int ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+	int ret;
 	char *data;
 
+	ret = task_get_notification(t);
 	if (ret < 0)
 		goto out;
-	if (ret == 0)
-		return;
+	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
+	if (ret <= 0)
+		goto out;
 	if (!powd) {
 		int32_t rate, ch, format;
 		get_btr_sample_rate(btrn, &rate);
@@ -207,13 +209,13 @@ __malloc static void *oss_parse_config_or_die(int argc, char **argv)
 	struct oss_write_args_info *conf = para_calloc(sizeof(*conf));
 
 	/* exits on errors */
-	oss_cmdline_parser(argc, argv, conf);
+	oss_write_cmdline_parser(argc, argv, conf);
 	return conf;
 }
 
 static void oss_free_config(void *conf)
 {
-	oss_cmdline_parser_free(conf);
+	oss_write_cmdline_parser_free(conf);
 }
 
 /**
@@ -227,7 +229,7 @@ void oss_write_init(struct writer *w)
 {
 	struct oss_write_args_info dummy;
 
-	oss_cmdline_parser_init(&dummy);
+	oss_write_cmdline_parser_init(&dummy);
 	w->close = oss_close;
 	w->pre_select = oss_pre_select;
 	w->post_select = oss_post_select;
@@ -237,5 +239,5 @@ void oss_write_init(struct writer *w)
 		.short_help = oss_write_args_info_help,
 		.detailed_help = oss_write_args_info_detailed_help
 	};
-	oss_cmdline_parser_free(&dummy);
+	oss_write_cmdline_parser_free(&dummy);
 }