$NetBSD: patch-ac,v 1.6 2004/11/19 12:15:14 adam Exp $ --- examples/sndfile-play.c.orig 2004-11-14 19:57:17.000000000 +0000 +++ examples/sndfile-play.c @@ -34,16 +34,21 @@ #include #endif -#if defined (__linux__) +#if defined (__linux__) || defined(USE_OSS) #include #include #include + #ifndef DEV_DSP + #define DEV_DSP "/dev/dsp" + #endif + #elif (defined (__MACH__) && defined (__APPLE__)) #include #include -#elif (defined (sun) && defined (unix)) +#elif (defined (sun) && defined (unix)) || \ + (defined (__NetBSD__) && !defined(USE_OSS)) #include #include #include @@ -324,7 +329,7 @@ alsa_write_float (snd_pcm_t *alsa_dev, f ** Linux/OSS functions for playing a sound. */ -#if defined (__linux__) +#if defined (__linux__) || defined(USE_OSS) static int linux_open_dsp_device (int channels, int srate) ; @@ -387,7 +392,7 @@ static int linux_open_dsp_device (int channels, int srate) { int fd, stereo, temp, error ; - if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1 && + if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1 && (fd = open ("/dev/sound/dsp", O_WRONLY, 0)) == -1) { perror ("linux_open_dsp_device : open ") ; exit (1) ; @@ -798,7 +803,8 @@ win32_play (int argc, char *argv []) ** Solaris. */ -#if (defined (sun) && defined (unix)) /* ie Solaris */ +#if (defined (sun) && defined (unix)) || \ + (defined (__NetBSD__) && !defined(USE_OSS)) static void solaris_play (int argc, char *argv []) @@ -905,7 +911,7 @@ main (int argc, char *argv []) return 1 ; } ; -#if defined (__linux__) +#if defined (__linux__) || defined (USE_OSS) #if HAVE_ALSA_ASOUNDLIB_H if (access ("/proc/asound/cards", R_OK) == 0) alsa_play (argc, argv) ; @@ -914,7 +920,8 @@ main (int argc, char *argv []) linux_play (argc, argv) ; #elif (defined (__MACH__) && defined (__APPLE__)) macosx_play (argc, argv) ; -#elif (defined (sun) && defined (unix)) +#elif (defined (sun) && defined (unix)) || \ + (defined (__NetBSD__) && !defined(USE_OSS)) solaris_play (argc, argv) ; #elif (OS_IS_WIN32 == 1) win32_play (argc, argv) ;