X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=160781a121a51f4adff74d88928144f06af4f5ee;hp=0759d678bc51ca90284108e3a5d5bc25a4c3fc4a;hb=c52b8398d68a87d8fac858f6681dee5f0b09289d;hpb=a28eef552dc779eac12c1df430522dc4e20ae428

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 0759d678..160781a1 100644
--- a/prebuffer_filter.c
+++ b/prebuffer_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2009-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -30,7 +30,7 @@ struct private_prebuffer_data {
 
 static void prebuffer_pre_select(struct sched *s, struct task *t)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = task_context(t);
 	struct btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
@@ -58,7 +58,7 @@ static void prebuffer_close(struct filter_node *fn)
 
 static int prebuffer_post_select(__a_unused struct sched *s, struct task *t)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = task_context(t);
 	struct btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
@@ -70,7 +70,7 @@ static int prebuffer_post_select(__a_unused struct sched *s, struct task *t)
 		return 0;
 	if (iqs < conf->size_arg)
 		return 0;
-	btr_splice_out_node(fn->btrn);
+	btr_splice_out_node(&fn->btrn);
 	return -E_PREBUFFER_SUCCESS;
 }
 
@@ -123,8 +123,5 @@ void prebuffer_filter_init(struct filter *f)
 	f->free_config = prebuffer_free_config;
 	f->pre_select = prebuffer_pre_select;
 	f->post_select = prebuffer_post_select;
-	f->help = (struct ggo_help) {
-		.short_help = prebuffer_filter_args_info_help,
-		.detailed_help = prebuffer_filter_args_info_detailed_help
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(prebuffer_filter);
 }