summaryrefslogtreecommitdiffstats
path: root/Graphic_Equalizer/src/fft.hcc
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2004-11-24 15:31:07 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2004-11-24 15:31:07 (GMT)
commit396167c9dff3d8ffc3c49d3eaf60b8a350fd908a (patch)
treea582a79c08402337d8ca57b9c630b377ec057cbe /Graphic_Equalizer/src/fft.hcc
parent3ff31863d7dc06829c1233a377ac2bce03cd8fe0 (diff)
downloadTASS-396167c9dff3d8ffc3c49d3eaf60b8a350fd908a.zip
TASS-396167c9dff3d8ffc3c49d3eaf60b8a350fd908a.tar.gz
TASS-396167c9dff3d8ffc3c49d3eaf60b8a350fd908a.tar.bz2
removed a bug and some par's that seem to be bothering us.
Diffstat (limited to 'Graphic_Equalizer/src/fft.hcc')
-rw-r--r--Graphic_Equalizer/src/fft.hcc12
1 files changed, 2 insertions, 10 deletions
diff --git a/Graphic_Equalizer/src/fft.hcc b/Graphic_Equalizer/src/fft.hcc
index ee15977..626b1b7 100644
--- a/Graphic_Equalizer/src/fft.hcc
+++ b/Graphic_Equalizer/src/fft.hcc
@@ -365,9 +365,7 @@ void perform_ifft(signed 16 *modified_audio, unsigned 6 *ifft_info)
modified_audio[k] = (p<-16);
#endif
//Fill the array for displaying the waveform, only the 6 MSB are needed.
- ifft_info[k] = (unsigned 6)(32+(p[17:12]));
-
- ifft_info[k] = (p[17:12]);
+ ifft_info[k] = (unsigned 6)(32+(p[17:12]));
k++;
}
} while(k);
@@ -421,15 +419,12 @@ void equalize_audio(audiodata_t *audiodata)
for(i=0;i!=NUMBER_OF_FREQUENCIES;i++)
{
- par
- {
// set multiplication factor (0..64) for current frequency bar, The first frequency band must be equalized at 100% (63) since there is no DC-component taken into account.
- a = (i==0) ? 63 : adjs(eq_settings[audiodata->equalizer_levels_ptr[i <- 7]],18);
+ a = adjs(eq_settings[audiodata->equalizer_levels_ptr[i <- 7]],18);
// multiply frequency with this factor and divide by 64 (drop 6 LSB's)
q = real.read[i];
- }
equalize_bar(p);
real.rwrite[i] = p;
@@ -455,8 +450,6 @@ void equalize_audio(audiodata_t *audiodata)
//write data to fft_info for display purposes
for(i=0;i<NUMBER_OF_FREQUENCIES;i++)
{
- par
- {
p = real.read[i];
q = imaginary.read[i];
#if HARDWARE_MULTIPLY
@@ -466,7 +459,6 @@ void equalize_audio(audiodata_t *audiodata)
if (p[23] == 1) p = -p; else delay;
if (q[23] == 1) q = -q; else delay;
#endif
- }
p = (p<q) ? q : p; // This is done to get the best visual frequency result
if (!audiodata->display_log)