X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=88047adbb71c2becef6afe13f45ab96ddd3b1774;hp=8408034d905c6f20eb375385d638de31a43df0e3;hb=bc78a94412b17dfd445d6bb88f752041df3cf7ba;hpb=7584638594109184f329bead008f1dcdd9030767

diff --git a/wav_filter.c b/wav_filter.c
index 8408034d..88047adb 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -7,7 +7,6 @@
 /** \file wav_filter.c A filter that inserts a wave header. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -32,7 +31,7 @@ static void make_wav_header(unsigned int channels, unsigned int sample_rate,
 	int bytespersec = channels * sample_rate * BITS / 8;
 	int align = channels * BITS / 8;
 
-	PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, sample_rate);
+	PARA_DEBUG_LOG("writing wave header: %u channels, %u KHz\n", channels, sample_rate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
 	write_u32(headbuf + 4, size - 8);
@@ -64,32 +63,30 @@ 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 void 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;
 	char *header, *buf;
 	int32_t rate, ch;
 
-	t->error = 0;
 	if (iqs == 0) {
 		ret = -E_WAV_EOF;
 		if (btr_no_parent(btrn))
 			goto err;
-		return;
+		return 0;
 	}
 	ret = btr_exec_up(btrn, "sample_rate", &buf);
 	if (ret < 0) {
@@ -114,13 +111,13 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
 	btr_add_output(header, WAV_HEADER_LEN, btrn);
 	ret = -E_WAV_SUCCESS;
 err:
-	t->error = ret;
 	if (ret == -E_WAV_SUCCESS)
-		btr_splice_out_node(btrn);
+		btr_splice_out_node(&fn->btrn);
 	else {
-		btr_remove_node(btrn);
+		btr_remove_node(&fn->btrn);
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	}
+	return ret;
 }
 
 /**