From: Andre Noll <maan@systemlinux.org>
Date: Tue, 12 Jan 2010 01:11:22 +0000 (+0100)
Subject: wav_filter: Kill non-btr code.
X-Git-Tag: v0.4.2~151
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7991d2871340f773ad7d0e819491fe905b184a5c;ds=sidebyside

wav_filter: Kill non-btr code.
---

diff --git a/wav_filter.c b/wav_filter.c
index 1acbfde6..4f12a34c 100644
--- a/wav_filter.c
+++ b/wav_filter.c
@@ -51,30 +51,6 @@ static void make_wav_header(unsigned int channels, unsigned int samplerate,
 	write_u32(headbuf + 40, size - 44); /* chunk size */
 }
 
-static ssize_t wav_convert(char *inbuf, size_t len, struct filter_node *fn)
-{
-	size_t copy;
-	int *bof = fn->private_data;
-
-	if (*bof) {
-		if (!len)
-			return 0;
-		if (!fn->fc->channels || !fn->fc->samplerate) {
-			PARA_ERROR_LOG("%s\n", para_strerror(E_WAV_BAD_FC));
-			return -E_WAV_BAD_FC;
-		}
-		make_wav_header(fn->fc->channels, fn->fc->samplerate, fn->buf);
-		fn->loaded = WAV_HEADER_LEN;
-		*bof = 0;
-//		return 0;
-	}
-	copy = PARA_MIN(len, fn->bufsize - fn->loaded);
-	memmove(fn->buf + fn->loaded, inbuf, copy);
-	fn->loaded += copy;
-//	PARA_DEBUG_LOG("len = %d, copy = %d\n", len, copy);
-	return copy;
-}
-
 static void wav_close(struct filter_node *fn)
 {
 	free(fn->buf);
@@ -118,7 +94,6 @@ static void wav_post_select(__a_unused struct sched *s, struct task *t)
 	char *header, *buf;
 	int32_t rate, ch;
 
-
 	t->error = 0;
 	if (iqs == 0) {
 		ret = -E_WAV_EOF;
@@ -159,13 +134,12 @@ err:
 }
 
 /**
- * the init function of the wav filter
+ * The init function of the wav filter.
  *
- * \param f struct to initialize
+ * \param f Structure to initialize.
  */
 void wav_filter_init(struct filter *f)
 {
-	f->convert = wav_convert;
 	f->close = wav_close;
 	f->open = wav_open;
 	f->pre_select = wav_pre_select;