Mercurial > audlegacy
changeset 1361:62a33367a6cb trunk
[svn] Forcibly disabled Altivec ifdefs. The code that it wants to call is not actually present. ffmpeg SVN (libavcodec/ppc) has code you could pinch, but that needs to be integrated in proper style. I have given up on this. If you get it working, submit me a patch.
| author | chainsaw |
|---|---|
| date | Thu, 29 Jun 2006 16:46:01 -0700 |
| parents | 7e312e0c33e8 |
| children | 651327e12a3a |
| files | ChangeLog Plugins/Input/wma/libffwma/dsputil.h Plugins/Input/wma/libffwma/fft.c Plugins/Input/wma/libffwma/wmadec.c |
| diffstat | 4 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 29 05:58:34 2006 -0700 +++ b/ChangeLog Thu Jun 29 16:46:01 2006 -0700 @@ -1,3 +1,12 @@ +2006-06-29 12:58:34 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> + revision [1632] + - now filepopup menu shows its state through checkbox. + + + Changes: Modified: + +7 -3 trunk/audacious/ui_playlist.c + + 2006-06-29 10:42:13 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [1630] - add a menu item that toggles filepopup to the playlist popup menu.
--- a/Plugins/Input/wma/libffwma/dsputil.h Thu Jun 29 05:58:34 2006 -0700 +++ b/Plugins/Input/wma/libffwma/dsputil.h Thu Jun 29 16:46:01 2006 -0700 @@ -385,7 +385,7 @@ extern int mm_flags; -#if defined(HAVE_ALTIVEC) && !defined(CONFIG_DARWIN) +#if defined(BLAH_NO_ALTIVEC) && !defined(CONFIG_DARWIN) #define pixel altivec_pixel #include <altivec.h> #undef pixel @@ -509,14 +509,4 @@ return score;\ } -#ifndef HAVE_LRINTF -/* XXX: add ISOC specific test to avoid specific BSD testing. */ -/* better than nothing implementation. */ -/* btw, rintf() is existing on fbsd too -- alex */ -static inline long int lrintf(float x) -{ - return (int)(rint(x)); -} #endif - -#endif
--- a/Plugins/Input/wma/libffwma/fft.c Thu Jun 29 05:58:34 2006 -0700 +++ b/Plugins/Input/wma/libffwma/fft.c Thu Jun 29 16:46:01 2006 -0700 @@ -56,14 +56,14 @@ s->fft_calc = fft_calc_c; s->exptab1 = NULL; /* compute constant table for HAVE_SSE version */ -#if (defined(HAVE_MMX) && defined(HAVE_BUILTIN_VECTOR)) || defined(HAVE_ALTIVEC) +#if (defined(HAVE_MMX) && defined(HAVE_BUILTIN_VECTOR)) || defined(BLAH_NO_ALTIVEC) { int has_vectors = 0; #if defined(HAVE_MMX) has_vectors = mm_support() & MM_SSE; #endif -#if defined(HAVE_ALTIVEC) && !defined(ALTIVEC_USE_REFERENCE_C_CODE) +#if defined(BLAH_NO_ALTIVEC) && !defined(ALTIVEC_USE_REFERENCE_C_CODE) has_vectors = mm_support() & MM_ALTIVEC; #endif if (has_vectors) {
--- a/Plugins/Input/wma/libffwma/wmadec.c Thu Jun 29 05:58:34 2006 -0700 +++ b/Plugins/Input/wma/libffwma/wmadec.c Thu Jun 29 16:46:01 2006 -0700 @@ -699,7 +699,7 @@ int coef_nb_bits, total_gain, parse_exponents; float window[BLOCK_MAX_SIZE * 2]; // XXX: FIXME!! there's a bug somewhere which makes this mandatory under altivec -#ifdef HAVE_ALTIVEC +#ifdef BLAH_NO_ALTIVEC volatile int nb_coefs[MAX_CHANNELS] __attribute__((aligned(16))); #else int nb_coefs[MAX_CHANNELS];