changeset 1110:c4063c84b797 trunk

[svn] - remove equalizer.c (unneeded)

--- a/Plugins/Input/mpg123/Makefile.in	Sun May 28 08:27:54 2006 -0700
+++ b/Plugins/Input/mpg123/Makefile.in	Mon May 29 11:25:33 2006 -0700
@@ -8,7 +8,7 @@
 SOURCES = mpg123.c configure.c fileinfo.c common.c \
 	decode_2to1.c decode_4to1.c \
 	layer1.c layer2.c layer3.c \
-	tabinit.c equalizer.c http.c \
+	tabinit.c http.c \
 	dxhead.c decode.c dct64.c psycho.c interface.c
 
 OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o

--- a/Plugins/Input/mpg123/equalizer.c	Sun May 28 08:27:54 2006 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-
-#include <math.h>
-
-#include "mpg123.h"
-
-
-static void
-init_spline(float *x, float *y, int n, float *y2)
-{
-
-    int i, k;
-    float p, qn, sig, un, *u;
-    u = (float *) g_malloc(n * sizeof(float));
-
-    y2[0] = u[0] = 0.0;
-
-    for (i = 1; i < n - 1; i++) {
-        sig = ((float) x[i] - x[i - 1]) / ((float) x[i + 1] - x[i - 1]);
-        p = sig * y2[i - 1] + 2.0;
-        y2[i] = (sig - 1.0) / p;
-        u[i] = (((float) y[i + 1] - y[i]) / (x[i + 1] - x[i])) -
-            (((float) y[i] - y[i - 1]) / (x[i] - x[i - 1]));
-        u[i] = (6.0 * u[i] / (x[i + 1] - x[i - 1]) - sig * u[i - 1]) / p;
-    }
-    qn = un = 0.0;
-
-    y2[n - 1] = (un - qn * u[n - 2]) / (qn * y2[n - 2] + 1.0);
-    for (k = n - 2; k >= 0; k--)
-        y2[k] = y2[k] * y2[k + 1] + u[k];
-    g_free(u);
-}
-
-static float
-eval_spline(float xa[], float ya[], float y2a[], int n, float x)
-{
-    int klo, khi, k;
-    float h, b, a;
-
-    klo = 0;
-    khi = n - 1;
-    while (khi - klo > 1) {
-        k = (khi + klo) >> 1;
-        if (xa[k] > x)
-            khi = k;
-        else
-            klo = k;
-    }
-    h = xa[khi] - xa[klo];
-    a = (xa[khi] - x) / h;
-    b = (x - xa[klo]) / h;
-    return (a * ya[klo] + b * ya[khi] +
-            ((a * a * a - a) * y2a[klo] + (b * b * b - b) * y2a[khi])
-            * (h * h) / 6.0);
-}
-
-void
-mpgdec_set_eq(int on, float preamp, float *b)
-{
-    float x[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 }, yf[10], val, band[10];
-    int bands[] = { 0, 4, 8, 16, 26, 78, 157, 313, 366, 418 };
-    int i, j;
-
-    mpgdec_info->eq_active = on;
-    if (mpgdec_info->eq_active) {
-        for (i = 0; i < 10; i++) {
-            band[i] = b[i] + preamp;
-        }
-
-        init_spline(x, band, 10, yf);
-        for (i = 0; i < 9; i++) {
-            for (j = bands[i]; j < bands[i + 1]; j++) {
-                val =
-                    eval_spline(x, band, yf, 10,
-                                i +
-                                ((float) (j - bands[i]) *
-                                 (1.0 / (bands[i + 1] - bands[i]))));
-                mpgdec_info->eq_mul[j] = pow(2, val / 10.0);
-            }
-        }
-        for (i = bands[9]; i < 576; i++)
-            mpgdec_info->eq_mul[i] = mpgdec_info->eq_mul[bands[9] - 1];
-    }
-}

--- a/Plugins/Input/mpg123/mpg123.c	Sun May 28 08:27:54 2006 -0700
+++ b/Plugins/Input/mpg123/mpg123.c	Mon May 29 11:25:33 2006 -0700
@@ -968,7 +968,7 @@
     stop,
     do_pause,
     seek,
-    mpgdec_set_eq,
+    NULL,
     get_time,
     NULL, NULL,
     cleanup,