X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=resample_filter.c;h=6a285ec3bbcacfd88941aeec5d913862adeb8839;hp=383332b2e2d2de9c82f96fe0b81b69a6081a746f;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=24bbc541c5d8ebe6fd5fa5798560fa833f9e1b79

diff --git a/resample_filter.c b/resample_filter.c
index 383332b2..6a285ec3 100644
--- a/resample_filter.c
+++ b/resample_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2012 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -65,9 +65,9 @@ static void resample_open(struct filter_node *fn)
 	btr_log_tree(btr_parent(btr_parent(btrn)), LL_INFO);
 }
 
-static void resample_pre_select(struct sched *s, struct task *t)
+static void resample_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct resample_context *ctx = fn->private_data;
 	int ret = btr_node_status(fn->btrn, fn->min_iqs, BTR_NT_INTERNAL);
 
@@ -202,10 +202,10 @@ static int resample_frames(int16_t *in, size_t num_frames, bool have_more,
 	return data.input_frames_used;
 }
 
-static int resample_post_select(__a_unused struct sched *s, struct task *t)
+static int resample_post_select(__a_unused struct sched *s, void *context)
 {
 	int ret;
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	struct resample_context *ctx = fn->private_data;
 	struct resample_filter_args_info *conf = fn->conf;
 	struct btr_node *btrn = fn->btrn;
@@ -306,13 +306,9 @@ void resample_filter_init(struct filter *f)
 	f->close = resample_close;
 	f->open = resample_open;
 	f->pre_select = resample_pre_select;
-	f->new_post_select = resample_post_select;
-	f->post_select = NULL;
+	f->post_select = resample_post_select;
 	f->parse_config = resample_parse_config;
 	f->free_config = resample_free_config;
 	f->execute = resample_execute;
-	f->help = (struct ggo_help) {
-		.short_help = resample_filter_args_info_help,
-		.detailed_help = resample_filter_args_info_detailed_help
-	};
+	f->help = (struct ggo_help)DEFINE_GGO_HELP(resample_filter);
 }