[Sumover-dev] [svn commit] r4425 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: douglask
Date: Wed Apr 15 10:03:51 2009
New Revision: 4425

Modified:
   rat/trunk/auddev.c
   rat/trunk/auddev_oss.c
   rat/trunk/configure.in

Log:
Fixes for NetBSD


Modified: rat/trunk/auddev.c
==============================================================================
--- rat/trunk/auddev.c	(original)
+++ rat/trunk/auddev.c	Wed Apr 15 10:03:51 2009
@@ -129,12 +129,8 @@
                 netbsd_audio_set_ogain,
                 netbsd_audio_get_ogain,
                 netbsd_audio_loopback,
-                netbsd_audio_oport_set,
-                netbsd_audio_oport_get,
                 netbsd_audio_oport_details,
                 netbsd_audio_oport_count,
-                netbsd_audio_iport_set,
-                netbsd_audio_iport_get,
                 netbsd_audio_iport_details,
                 netbsd_audio_iport_count,
                 netbsd_audio_is_ready,

Modified: rat/trunk/auddev_oss.c
==============================================================================
--- rat/trunk/auddev_oss.c	(original)
+++ rat/trunk/auddev_oss.c	Wed Apr 15 10:03:51 2009
@@ -120,11 +120,7 @@
 static int
 oss_setfd(int fd)
 {
-#if HAVE_NETBSD_AUDIO
-	return auddev_netbsd_setfd(fd);
-#else
 	return ioctl(fd, SNDCTL_DSP_SETDUPLEX, 0);
-#endif
 }
 
 static int

Modified: rat/trunk/configure.in
==============================================================================
--- rat/trunk/configure.in	(original)
+++ rat/trunk/configure.in	Wed Apr 15 10:03:51 2009
@@ -213,7 +213,7 @@
 *freebsd*)
 	# PC Speaker device on FreeBSD
 	AC_CHECK_HEADERS(machine/pcaudioio.h)
-	if test $ac_cv_header_machine_h="yes" ; then
+	if test "$ac_cv_header_machine_h"="yes" ; then
 		AUD_OBJ="$AUD_OBJ auddev_pca.o"
 		AC_DEFINE(HAVE_PCA_AUDIO)
 	fi
@@ -225,10 +225,15 @@
   	AC_DEFINE(HAVE_NEWPCM_AUDIO) 
 	;;
 *netbsd*)
-	AUD_OBJ="$AUDIOBJ auddev_netbsd.o auddev_oss.o"
+	AC_CHECK_LIB(ossaudio, main)
+	if test "$ac_cv_lib_ossaudio_main"="yes"; then
+		AUDIOBJ="$AUDIOBJ auddev_oss.o"
+		AUD_LIB="$AUD_LIB -lossaudio"
+		AC_DEFINE(HAVE_OSS_AUDIO)
+	fi
+	AUD_OBJ="$AUDIOBJ auddev_netbsd.o"
 	AC_DEFINE(HAVE_NETBSD_AUDIO)
 	AC_CHECK_HEADERS(sys/soundcard.h soundcard.h)
-	AC_DEFINE(HAVE_OSS_AUDIO)
 	;;
 *irix*)
 	AUD_LIB="$AUD_LIB -laudio"