X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=compress.c;h=c30c998a33eb3354968f6801fe4890aea43e3b19;hp=8e2f07c9c4f3342e2984c5b4b8b2a0b047bb038c;hb=e37500d29b2b699762e1aa196b14c41303bb1055;hpb=122af971c336b33df2e7233d3cea3287bbdae712

diff --git a/compress.c b/compress.c
index 8e2f07c9..c30c998a 100644
--- a/compress.c
+++ b/compress.c
@@ -16,7 +16,6 @@
 #include "sched.h"
 #include "filter.h"
 #include "string.h"
-#include "audiod.h"
 
 /** The size of the output data buffer. */
 #define COMPRESS_CHUNK_SIZE 40960
@@ -35,8 +34,6 @@ struct private_compress_data {
 	unsigned num_samples;
 	/** Absolute value of the maximal sample in the current block. */
 	unsigned peak;
-	/** Amplification factor. */
-	unsigned amp;
 };
 
 static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
@@ -52,9 +49,8 @@ static ssize_t compress(char *inbuf, size_t inbuf_len, struct filter_node *fn)
 		return 0;
 	for (i = 0; i < length / 2; i++) {
 		/* be careful in that heat, my dear */
-		int sample = *ip++, adjusted_sample = (PARA_ABS(sample) * (64 + pcd->amp)) >> 6;
-
-		adjusted_sample = (adjusted_sample * pcd->current_gain) >> gain_shift;
+		int sample = *ip++, adjusted_sample = (PARA_ABS(sample) *
+			pcd->current_gain) >> gain_shift;
 		if (unlikely(adjusted_sample > 32767)) { /* clip */
 			PARA_NOTICE_LOG("clip: sample: %d, adjusted sample: %d\n",
 				sample, adjusted_sample);
@@ -106,13 +102,6 @@ static void open_compress(struct filter_node *fn)
 	fn->buf = para_malloc(fn->bufsize);
 	pcd->current_gain = 1 << pcd->conf->inertia_arg;
 	pcd->max_gain = 1 << (pcd->conf->inertia_arg + pcd->conf->aggressiveness_arg);
-	if (stat_item_values[SI_AMPLIFICATION]) {
-		int i = SI_AMPLIFICATION;
-		char *s = stat_item_values[i] + strlen(status_item_list[i]) + 1;
-		sscanf(s, "%u", &pcd->amp);
-	}
-	PARA_NOTICE_LOG("amplification: %u (scaling factor: %1.2f)\n", pcd->amp,
-		pcd->amp / 64.0 + 1.0);
 }
 
 /**