From: Andre Noll <maan@systemlinux.org>
Date: Tue, 12 Jan 2010 03:11:09 +0000 (+0100)
Subject: amp: Kill non-btr code.
X-Git-Tag: v0.4.2~150
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=e49c1a0bf9c48dfd597eb082fadf728a34d870b0;p=paraslash.git

amp: Kill non-btr code.
---

diff --git a/amp_filter.c b/amp_filter.c
index 690080bd..5e58212d 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -32,33 +32,6 @@ struct private_amp_data {
 	unsigned amp;
 };
 
-static ssize_t amp_convert(char *inbuf, size_t inbuf_len, struct filter_node *fn)
-{
-	size_t i, length = PARA_MIN((inbuf_len / 2),
-		(fn->bufsize - fn->loaded) / 2);
-	struct private_amp_data *pad = fn->private_data;
-	int16_t *ip = (int16_t *)inbuf, *op = (int16_t *)(fn->buf + fn->loaded);
-	int factor = 64 + pad->amp;
-
-	if (!length)
-		return 0;
-
-	if (pad->amp == 0) {
-		memcpy(op, ip, length * 2);
-		goto out;
-	}
-	for (i = 0; i < length; i++) {
-		int x = (ip[i] * factor) >> 6;
-
-		op[i] = x;
-		if (op[i] != x)
-			op[i] = (x >= 32768)? 32767 : -32768;
-	}
-out:
-	fn->loaded += length * 2;
-	return length * 2;
-}
-
 static void amp_close(struct filter_node *fn)
 {
 	free(fn->private_data);
@@ -172,7 +145,6 @@ void amp_filter_init(struct filter *f)
 	amp_cmdline_parser_init(&dummy);
 	f->open = amp_open;
 	f->close = amp_close;
-	f->convert = amp_convert;
 	f->pre_select = generic_filter_pre_select;
 	f->post_select = amp_post_select;
 	f->parse_config = amp_parse_config;