X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=d4bfd446ab845ef1b381201bccf091fadfae96c0;hp=8ca3c525a664b3faf307d5c5d66c6886e7a3c8eb;hb=edf7c2476f6c8dcc6a9f5a1dbcfbcdc59104f462;hpb=ff12b505b227585daf5aecc822d6b2e8841c2be7

diff --git a/oss_write.c b/oss_write.c
index 8ca3c525..d4bfd446 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-2014 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -44,9 +44,9 @@ static int get_oss_format(enum sample_format sf)
 	}
 }
 
-static void oss_pre_select(struct sched *s, struct task *t)
+static void oss_pre_select(struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_oss_write_data *powd = wn->private_data;
 	int ret = btr_node_status(wn->btrn, wn->min_iqs, BTR_NT_LEAF);
 
@@ -157,17 +157,16 @@ err_free:
 	return ret;
 }
 
-static void oss_post_select(__a_unused struct sched *s,
-		struct task *t)
+static int oss_post_select(__a_unused struct sched *s, void *context)
 {
-	struct writer_node *wn = container_of(t, struct writer_node, task);
+	struct writer_node *wn = context;
 	struct private_oss_write_data *powd = wn->private_data;
 	struct btr_node *btrn = wn->btrn;
 	size_t frames, bytes;
 	int ret;
 	char *data;
 
-	ret = task_get_notification(t);
+	ret = task_get_notification(wn->task);
 	if (ret < 0)
 		goto out;
 	ret = btr_node_status(btrn, wn->min_iqs, BTR_NT_LEAF);
@@ -181,7 +180,7 @@ static void oss_post_select(__a_unused struct sched *s,
 		ret = oss_init(wn, rate, ch, format);
 		if (ret < 0)
 			goto out;
-		return;
+		return 0;
 	}
 	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
@@ -199,9 +198,9 @@ static void oss_post_select(__a_unused struct sched *s,
 	btr_consume(btrn, ret);
 	ret = 0;
 out:
-	t->error = ret;
 	if (ret < 0)
 		btr_remove_node(&wn->btrn);
+	return ret;
 }
 
 __malloc static void *oss_parse_config_or_die(int argc, char **argv)
@@ -235,9 +234,6 @@ void oss_write_init(struct writer *w)
 	w->post_select = oss_post_select;
 	w->parse_config_or_die = oss_parse_config_or_die;
 	w->free_config = oss_free_config;
-	w->help = (struct ggo_help) {
-		.short_help = oss_write_args_info_help,
-		.detailed_help = oss_write_args_info_detailed_help
-	};
+	w->help = (struct ggo_help)DEFINE_GGO_HELP(oss_write);
 	oss_write_cmdline_parser_free(&dummy);
 }