X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=prebuffer_filter.c;h=6078da0757f885eec2fec0dcb9fbda88cb99f454;hp=5ccfa456a72e3055b24b00eb06801a05cd7cef95;hb=de9ce9690ac6194e8e7eaacd10baf21d827e42a4;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136

diff --git a/prebuffer_filter.c b/prebuffer_filter.c
index 5ccfa456..6078da07 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 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -28,9 +28,9 @@ struct private_prebuffer_data {
 	struct timeval barrier;
 };
 
-static void prebuffer_pre_select(struct sched *s, struct task *t)
+static void prebuffer_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
@@ -56,9 +56,9 @@ static void prebuffer_close(struct filter_node *fn)
 	free(fn->private_data);
 }
 
-static int prebuffer_post_select(__a_unused struct sched *s, struct task *t)
+static int prebuffer_post_select(__a_unused struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct btr_node *btrn = fn->btrn;
 	size_t iqs = btr_get_input_queue_size(btrn);
 	struct private_prebuffer_data *ppd = fn->private_data;
@@ -70,14 +70,14 @@ 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;
 }
 
 static int prebuffer_parse_config(int argc, char **argv, void **config)
 {
 	struct prebuffer_filter_args_info *conf = para_calloc(sizeof(*conf));
-	int ret = -E_PREBUFFER_SYNTAX;
+	int ret;
 
 	prebuffer_filter_cmdline_parser(argc, argv, conf);
 	ret = -ERRNO_TO_PARA_ERROR(EINVAL);
@@ -122,9 +122,6 @@ void prebuffer_filter_init(struct filter *f)
 	f->parse_config = prebuffer_parse_config;
 	f->free_config = prebuffer_free_config;
 	f->pre_select = prebuffer_pre_select;
-	f->new_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->post_select = prebuffer_post_select;
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(prebuffer_filter);
 }