Changeset 1349

Timestamp:

02/21/08 11:07:31 (10 months ago)

Author:

jpgrayson

Message:

- Partial patch for NetBSD support.
-- Change DEVICE_NAME_BASE when building for NetBSD.
-- Only use SNDCTL_DSP_GETODELAY ioctl() if it is available.

Files:

• portaudio/branches/v19-devel/src/hostapi/oss/pa_unix_oss.c (modified) (2 diffs)

portaudio/branches/v19-devel/src/hostapi/oss/pa_unix_oss.c

@@ -66 +66 @@
 #ifdef HAVE_SYS_SOUNDCARD_H
 # include <sys/soundcard.h>
-# define DEVICE_NAME_BASE            "/dev/dsp"
+# ifdef __NetBSD__
+#  define DEVICE_NAME_BASE           "/dev/audio"
+# else
+#  define DEVICE_NAME_BASE           "/dev/dsp"
+# endif
 #elif defined(HAVE_LINUX_SOUNDCARD_H)
 # include <linux/soundcard.h>
@@ -1971 +1975 @@
     PaOssStream *stream = (PaOssStream*)s;
     int delay = 0;
-
+#ifdef SNDCTL_DSP_GETODELAY
     ENSURE_( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ), paUnanticipatedHostError );
+#endif
     return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );