From 87fc63d4b73bb977c0ebce1d560bd9b34b5f13d9 Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Tue, 29 Oct 2013 21:11:37 +0100 Subject: use proper api for freq vis --- fft.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'fft.c') diff --git a/fft.c b/fft.c index 7b6a3a75..59d36e91 100644 --- a/fft.c +++ b/fft.c @@ -27,9 +27,9 @@ #include #include -static float hamming[DDB_AUDIO_MEMORY_FRAMES]; /* hamming window, scaled to sum to 1 */ -static int reversed[DDB_AUDIO_MEMORY_FRAMES]; /* bit-reversal table */ -static float complex roots[DDB_AUDIO_MEMORY_FRAMES / 2]; /* N-th roots of unity */ +static float hamming[DDB_FREQ_BANDS]; /* hamming window, scaled to sum to 1 */ +static int reversed[DDB_FREQ_BANDS]; /* bit-reversal table */ +static float complex roots[DDB_FREQ_BANDS / 2]; /* N-th roots of unity */ static int generated = 0; static float LOGN; /* log N (base 2) */ @@ -59,7 +59,7 @@ static void generate_tables (void) if (generated) return; - const int N = DDB_AUDIO_MEMORY_FRAMES; + const int N = DDB_FREQ_BANDS; LOGN = log2(N); for (int n = 0; n < N; n ++) hamming[n] = 1 - 0.85 * cosf (2 * M_PI * n / N); @@ -71,9 +71,9 @@ static void generate_tables (void) generated = 1; } -static void do_fft (float complex a[DDB_AUDIO_MEMORY_FRAMES]) +static void do_fft (float complex a[DDB_FREQ_BANDS]) { - const int N = DDB_AUDIO_MEMORY_FRAMES; + const int N = DDB_FREQ_BANDS; int half = 1; /* (2^s)/2 */ int inv = N / 2; /* N/(2^s) */ @@ -104,7 +104,7 @@ calc_freq (float *data, float *freq) { // fft code shamelessly stolen from audacious // thanks, John - int N = DDB_AUDIO_MEMORY_FRAMES; + int N = DDB_FREQ_BANDS; float complex a[N]; for (int n = 0; n < N; n ++) { a[reversed[n]] = data[n] * hamming[n]; -- cgit v1.2.3