X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=e749160d3337e87dc7c908c023ea100c955590e4;hp=c5079061972d838d1e76d0308db02cd61e341998;hb=HEAD;hpb=9de1287d67c9562e9140c6dc7deb0c01c4e10cc0

diff --git a/wav_filter.c b/wav_filter.c
index c5079061..de4a3e6a 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file wav_filter.c A filter that inserts a wave header. */
 
@@ -12,7 +8,6 @@
 #include "error.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
@@ -31,7 +26,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);
@@ -58,37 +53,35 @@ static void wav_open(struct filter_node *fn)
 {
 	int *bof;
 
-	fn->private_data = para_malloc(sizeof(int));
+	fn->private_data = alloc(sizeof(int));
 	bof = fn->private_data;
 	*bof = 1;
 }
 
-static void wav_pre_select(struct sched *s, struct task *t)
+static void wav_pre_monitor(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_monitor(__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;
+		ret = -E_EOF;
 		if (btr_no_parent(btrn))
 			goto err;
-		return;
+		return 0;
 	}
 	ret = btr_exec_up(btrn, "sample_rate", &buf);
 	if (ret < 0) {
@@ -108,29 +101,23 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
 	free(buf);
 	if (ret < 0)
 		goto err;
-	header = para_malloc(WAV_HEADER_LEN);
+	header = alloc(WAV_HEADER_LEN);
 	make_wav_header(ch, rate, header);
 	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;
 }
 
-/**
- * The init function of the wav filter.
- *
- * \param f Structure to initialize.
- */
-void wav_filter_init(struct filter *f)
-{
-	f->close = wav_close;
-	f->open = wav_open;
-	f->pre_select = wav_pre_select;
-	f->post_select = wav_post_select;
-}
+const struct filter lsg_filter_cmd_com_wav_user_data = {
+	.close = wav_close,
+	.open = wav_open,
+	.pre_monitor = wav_pre_monitor,
+	.post_monitor = wav_post_monitor,
+};