X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=wav_filter.c;h=8408034d905c6f20eb375385d638de31a43df0e3;hp=abd850b2499429ab5e992b771b4144d371a9d987;hb=7e37a7cf49df279b9ab467fa4f62dd376c791a26;hpb=6668ac4a8c7f2a92efb9e6d405d954beff77d230

diff --git a/wav_filter.c b/wav_filter.c
index abd850b2..8408034d 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -24,15 +24,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: %d channels, %d KHz\n", channels, sample_rate);
 	memset(headbuf, 0, WAV_HEADER_LEN);
 	memcpy(headbuf, "RIFF", 4);
 	write_u32(headbuf + 4, size - 8);
@@ -41,7 +41,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 */
@@ -72,8 +72,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)
@@ -92,7 +91,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;