Mercurial > audlegacy
changeset 461:60dac59c393a trunk
[svn] Remove EQ again. *grr*
| author | nenolod |
|---|---|
| date | Tue, 17 Jan 2006 18:15:15 -0800 |
| parents | ccb34144939c |
| children | b65fe3b68300 |
| files | Plugins/Input/wma/wma.c |
| diffstat | 1 files changed, 2 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/wma/wma.c Tue Jan 17 18:12:22 2006 -0800 +++ b/Plugins/Input/wma/wma.c Tue Jan 17 18:15:15 2006 -0800 @@ -36,7 +36,6 @@ #include "avcodec.h" #include "avformat.h" -#include "iir.h" #define ABOUT_TXT "Adapted for use in audacious by Tony Vroon (chainsaw@gentoo.org) from\n \ the BEEP-WMA plugin which is Copyright (C) 2004,2005 Mokrushin I.V. aka McMCC (mcmcc@mail.ru)\n \ @@ -99,7 +98,7 @@ wma_stop, // Stop wma_do_pause, // Pause wma_seek, // Seek - wma_set_eq, // Set the equalizer, most plugins won't be able to do this + NULL, // Set the equalizer, most plugins won't be able to do this wma_get_time, // Get the time, usually returns the output plugins output time NULL, // Get volume NULL, // Set volume @@ -181,7 +180,6 @@ avcodec_init(); avcodec_register_all(); av_register_all(); - init_iir(); } static int wma_is_our_file(char *filename) @@ -215,27 +213,6 @@ return -1; } -static void wma_set_eq(int q_on, float q_preamp, float *q_bands) -{ - int chn; - int index; - float value; - - wma_eq_on = q_on; - if(wma_eq_on) - { - q_preamp = q_preamp/1.6; - for(chn = 0; chn < c->channels; chn++) - preamp[chn] = 1.0 + 0.0932471 * q_preamp + 0.00279033 * q_preamp * q_preamp; - for(index = 0; index < 10; index++) - { - value = q_bands[index]/1.2; - for(chn = 0; chn < c->channels; chn++) - gain[index][chn] = 0.03 * value + 0.000999999 * value * value; - } - } -} - static gchar *extname(const char *filename) { gchar *ext = strrchr(filename, '.'); @@ -322,10 +299,7 @@ fifo_write(&f, wma_outbuf, out_size, &f.wptr); while(!fifo_read(&f, wma_s_outbuf, wma_st_buff, &f.rptr) && wma_decode) { - if(wma_eq_on) - sst_buff = iir((gpointer)&wma_s_outbuf, wma_st_buff); - else - sst_buff = wma_st_buff; + sst_buff = wma_st_buff; if(wma_pause) memset(wma_s_outbuf, 0, sst_buff); while(wma_ip.output->buffer_free() < wma_st_buff) xmms_usleep(20000); produce_audio(wma_ip.output->written_time(), FMT_S16_NE,