changeset 1353:35ef03569852 trunk

[svn] Hook up Altivec-enabled DCT64 for MP3. WMA throws a tantrum on Altivec machines. Submit a patch, or wait for me to fix it.
author chainsaw
date Wed, 28 Jun 2006 18:21:25 -0700
parents 8b249765fdd1
children a0b8858c0342
files ChangeLog Plugins/Input/mpg123/Makefile.in configure.ac mk/rules.mk.in
diffstat 4 files changed, 23 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 28 15:32:15 2006 -0700
+++ b/ChangeLog	Wed Jun 28 18:21:25 2006 -0700
@@ -1,3 +1,12 @@
+2006-06-28 22:32:15 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [1616]
+  - GList cannot handle circular queues, so I integrated one into CategoryQueueEntry. No fuss, no muss.
+  
+
+  Changes:        Modified:
+  +14 -8          trunk/audacious/prefswin.c  
+
+
 2006-06-28 20:50:30 +0000  William Pitcock <nenolod@nenolod.net>
   revision [1614]
   - why are we requiring a lock in functions that are in the nolock namespace?
--- a/Plugins/Input/mpg123/Makefile.in	Wed Jun 28 15:32:15 2006 -0700
+++ b/Plugins/Input/mpg123/Makefile.in	Wed Jun 28 18:21:25 2006 -0700
@@ -9,7 +9,7 @@
 	resample.c \
 	layer1.c layer2.c layer3.c \
 	tabinit.c http.c \
-	dxhead.c decode.c dct64.c paranoia.c interface.c
+	dxhead.c decode.c $(DCT64) paranoia.c interface.c
 
 OBJECTS = ${SOURCES:.c=.o} tag_c_hacked.o
 
--- a/configure.ac	Wed Jun 28 15:32:15 2006 -0700
+++ b/configure.ac	Wed Jun 28 18:21:25 2006 -0700
@@ -32,8 +32,8 @@
 
 dnl Check for C compiler
 
-AC_LANG([C])
-AC_LANG([C++])
+AC_PROG_CC
+AC_PROG_CXX
 AC_ISC_POSIX
 AC_C_BIGENDIAN
 
@@ -272,6 +272,16 @@
     have_esd=no
 fi
 
+dnl *** AltiVec
+
+AC_CHECK_HEADERS(altivec.h,
+    [AC_DEFINE(HAVE_ALTIVEC, 1, [Define to 1 if your system has AltiVec.])
+     AC_DEFINE(ARCH_POWERPC, 1, [Define to 1 if your system is a PowerPC.])
+     DCT64=dct64_altivec.c],
+    [DCT64=dct64.c]
+)    
+AC_SUBST(DCT64)
+
 dnl *** MP3
 
 AC_ARG_ENABLE(mp3,
--- a/mk/rules.mk.in	Wed Jun 28 15:32:15 2006 -0700
+++ b/mk/rules.mk.in	Wed Jun 28 18:21:25 2006 -0700
@@ -95,6 +95,7 @@
 CXXFLAGS ?= @CXXFLAGS@
 CYGPATH_W ?= @CYGPATH_W@
 DATADIRNAME ?= @DATADIRNAME@
+DCT64 ?= @DCT64@
 DEFS ?= @DEFS@
 DEPDIR ?= @DEPDIR@
 ECHO ?= @ECHO@