X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=07423a14b6f41973e1fb391b0733837b5751d1ce;hp=c2a9329f15e931af76fa10cdcab9913e627b0a24;hb=5e8d8a8eea6de9459ebdf4498f9f061c84bfa63a;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136

diff --git a/wav_filter.c b/wav_filter.c
index c2a9329f..07423a14 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -63,20 +63,19 @@ static void wav_open(struct filter_node *fn)
 	*bof = 1;
 }
 
-static void wav_pre_select(struct sched *s, struct task *t)
+static void wav_pre_select(struct sched *s, void *context)
 {
-	struct filter_node *fn = container_of(t, struct filter_node, task);
+	struct filter_node *fn = context;
 	size_t iqs = btr_get_input_queue_size(fn->btrn);
 
-	t->error = 0;
 	if (iqs == 0)
 		return;
 	sched_min_delay(s);
 }
 
-static int wav_post_select(__a_unused struct sched *s, struct task *t)
+static int wav_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);
 	int ret;
@@ -113,7 +112,7 @@ static int wav_post_select(__a_unused struct sched *s, struct task *t)
 	ret = -E_WAV_SUCCESS;
 err:
 	if (ret == -E_WAV_SUCCESS)
-		btr_splice_out_node(btrn);
+		btr_splice_out_node(&fn->btrn);
 	else {
 		btr_remove_node(&fn->btrn);
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -131,5 +130,5 @@ void wav_filter_init(struct filter *f)
 	f->close = wav_close;
 	f->open = wav_open;
 	f->pre_select = wav_pre_select;
-	f->new_post_select = wav_post_select;
+	f->post_select = wav_post_select;
 }