X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=e749160d3337e87dc7c908c023ea100c955590e4;hp=abd850b2499429ab5e992b771b4144d371a9d987;hb=d4603bf234d23adb56b208efb90ce66772c4ef5b;hpb=e90440367f744a7723b201a95888e66f070ffa92

diff --git a/wav_filter.c b/wav_filter.c
index abd850b2..e749160d 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,19 +1,13 @@
-/*
- * Copyright (C) 2005-2010 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. */
 
 #include <regex.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
 #include "list.h"
 #include "sched.h"
-#include "ggo.h"
 #include "buffer_tree.h"
 #include "filter.h"
 #include "string.h"
@@ -24,15 +18,15 @@
 /** Always write 16 bit header. */
 #define BITS 16
 
-static void make_wav_header(unsigned int channels, unsigned int samplerate,
+static void make_wav_header(unsigned int channels, unsigned int sample_rate,
 		char *headbuf)
 {
 
 	unsigned int size = 0x7fffffff;
-	int bytespersec = channels * samplerate * BITS / 8;
+	int bytespersec = channels * sample_rate * BITS / 8;
 	int align = channels * BITS / 8;
 
-	PARA_DEBUG_LOG("writing wave header: %d channels, %d KHz\n", channels, samplerate);
+	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);
@@ -41,7 +35,7 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 	write_u32(headbuf + 16, 16); /* 16 + extra format bytes (zero) */
 	write_u16(headbuf + 20, 1);	/* format (1 == PCM/uncompressed) */
 	write_u16(headbuf + 22, channels);
-	write_u32(headbuf + 24, samplerate);
+	write_u32(headbuf + 24, sample_rate);
 	write_u32(headbuf + 28, bytespersec);
 	write_u16(headbuf + 32, align); /* number of bytes per sample slice */
 	write_u16(headbuf + 34, BITS); /* significant bits per sample */
@@ -64,35 +58,32 @@ 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;
-	s->timeout.tv_sec = 0;
-	s->timeout.tv_usec = 1;
+	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, "samplerate", &buf);
+	ret = btr_exec_up(btrn, "sample_rate", &buf);
 	if (ret < 0) {
 		ret = -E_WAV_BAD_FC;
 		goto err;
@@ -115,24 +106,18 @@ 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;
 }
 
-/**
- * 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_select = wav_pre_select,
+	.post_select = wav_post_select,
+};