X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=716d8dd94c318cca2fb17a16a6d062a929099f92;hp=4f12a34c03fe5a74d58e772ba76df23f40fa5735;hb=c5e38315901ea63efd169af5d4ba3f3c66db7de9;hpb=7991d2871340f773ad7d0e819491fe905b184a5c

diff --git a/wav_filter.c b/wav_filter.c
index 4f12a34c..716d8dd9 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
  *
  * 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"
@@ -19,22 +18,20 @@
 #include "string.h"
 #include "portable_io.h"
 
-/** size of the output buffer */
-#define WAV_OUTBUF_SIZE 81920
-/** a wav header is always 44 bytes */
+/** A wav header is always 44 bytes. */
 #define WAV_HEADER_LEN 44
-/** always write 16 bit header */
+/** 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: %d channels, %d KHz\n", channels, sample_rate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
 	write_u32(headbuf + 4, size - 8);
@@ -43,7 +40,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 */
@@ -53,8 +50,6 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 
 static void wav_close(struct filter_node *fn)
 {
-	free(fn->buf);
-	fn->buf = NULL;
 	free(fn->private_data);
 	fn->private_data = NULL;
 }
@@ -63,14 +58,9 @@ static void wav_open(struct filter_node *fn)
 {
 	int *bof;
 
-	fn->bufsize = WAV_OUTBUF_SIZE;
-	fn->buf = para_malloc(fn->bufsize);
 	fn->private_data = para_malloc(sizeof(int));
 	bof = fn->private_data;
-	fn->loaded = 0;
 	*bof = 1;
-	PARA_INFO_LOG("wav filter node: %p, output buffer: %p, loaded: %zd\n",
-		fn, fn->buf, fn->loaded);
 }
 
 static void wav_pre_select(struct sched *s, struct task *t)
@@ -81,8 +71,7 @@ static void wav_pre_select(struct sched *s, struct task *t)
 	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)
@@ -101,7 +90,7 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
 			goto err;
 		return;
 	}
-	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;
@@ -128,7 +117,7 @@ err:
 	if (ret == -E_WAV_SUCCESS)
 		btr_splice_out_node(btrn);
 	else {
-		btr_remove_node(btrn);
+		btr_remove_node(&fn->btrn);
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 	}
 }