Mercurial > audlegacy
changeset 352:f13ab2d8e9cf trunk
[svn] various fixes :(
| author | nenolod |
|---|---|
| date | Mon, 26 Dec 2005 14:12:35 -0800 |
| parents | c6e9eb0ee70b |
| children | 18f881216679 |
| files | Plugins/Input/console/Audacious_Driver.cpp Plugins/Input/mpg123/mpg123.c Plugins/Input/musepack/equalizer.cpp Plugins/Input/musepack/libmpc.h Plugins/Input/sexypsf/spu.c Plugins/Input/sid/xmms-sid.c Plugins/Input/wma/wma.c |
| diffstat | 7 files changed, 8 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/console/Audacious_Driver.cpp Mon Dec 26 13:56:03 2005 -0800 +++ b/Plugins/Input/console/Audacious_Driver.cpp Mon Dec 26 14:12:35 2005 -0800 @@ -409,7 +409,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, console_ip_is_going); + MY_FMT, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -441,7 +441,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, console_ip_is_going); + MY_FMT, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -473,7 +473,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, console_ip_is_going); + MY_FMT, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); } @@ -505,7 +505,7 @@ audcfg.loop_length && audcfg.loop_length != 0) break; produce_audio(console_ip.output->written_time(), - MY_FMT, 1, 2048, buf, console_ip_is_going); + MY_FMT, 1, 2048, buf, NULL); while(console_ip.output->buffer_free() < 2048) xmms_usleep(10000); }
--- a/Plugins/Input/mpg123/mpg123.c Mon Dec 26 13:56:03 2005 -0800 +++ b/Plugins/Input/mpg123/mpg123.c Mon Dec 26 14:12:35 2005 -0800 @@ -444,8 +444,6 @@ guint mpg123_strip_spaces(char *src, size_t n) -/* strips trailing spaces from string of length n - returns length of adjusted string */ { gchar *space = NULL, /* last space in src */ *start = src;
--- a/Plugins/Input/musepack/equalizer.cpp Mon Dec 26 13:56:03 2005 -0800 +++ b/Plugins/Input/musepack/equalizer.cpp Mon Dec 26 14:12:35 2005 -0800 @@ -165,19 +165,6 @@ out[channel] += (data[index + channel] >> 2); //printf("out[channel] = %f\n", out[channel]); - /* Round and convert to integer */ -#if 0 -#ifdef PPC - tempgint = round_ppc(out[channel]); -#else -# ifdef X86 - tempgint = round_trick(out[channel]); -# else - tempgint = (int) lroundf(out[channel]); -# endif -#endif -#endif - //tempgint = (int) lroundf(out[channel]); tempgint = (int) out[channel]; //printf("iir: old=%d new=%d\n", data[index+channel], tempgint);
--- a/Plugins/Input/musepack/libmpc.h Mon Dec 26 13:56:03 2005 -0800 +++ b/Plugins/Input/musepack/libmpc.h Mon Dec 26 14:12:35 2005 -0800 @@ -5,6 +5,7 @@ extern "C" { #include "audacious/plugin.h" +#include "audacious/output.h" #include "libaudacious/util.h" #include "libaudacious/configdb.h" #include "libaudacious/titlestring.h"
--- a/Plugins/Input/sexypsf/spu.c Mon Dec 26 13:56:03 2005 -0800 +++ b/Plugins/Input/sexypsf/spu.c Mon Dec 26 14:12:35 2005 -0800 @@ -601,7 +601,7 @@ memset((void *)s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN)); pSpuIrq=0; - iVolume=128; //85; + iVolume=192; //85; SetupStreams(); // prepare streaming bSPUIsOpen=1;