head 1.14; access; symbols pkgsrc-2013Q2:1.14.0.6 pkgsrc-2013Q2-base:1.14 pkgsrc-2012Q4:1.14.0.4 pkgsrc-2012Q4-base:1.14 pkgsrc-2011Q4:1.14.0.2 pkgsrc-2011Q4-base:1.14 pkgsrc-2011Q2:1.12.0.4 pkgsrc-2011Q2-base:1.12 pkgsrc-2009Q4:1.12.0.2 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.11.0.6 pkgsrc-2009Q3-base:1.11 pkgsrc-2009Q2:1.11.0.4 pkgsrc-2009Q2-base:1.11 pkgsrc-2009Q1:1.11.0.2 pkgsrc-2008Q4:1.9.0.10 pkgsrc-2008Q4-base:1.9 pkgsrc-2008Q3:1.9.0.8 pkgsrc-2008Q3-base:1.9 cube-native-xorg:1.9.0.6 cube-native-xorg-base:1.9 pkgsrc-2008Q2:1.9.0.4 pkgsrc-2008Q2-base:1.9 cwrapper:1.9.0.2 pkgsrc-2008Q1:1.8.0.14 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.12 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.10 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.8 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.6 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.4 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.2 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.7.0.6 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.4 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.2 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.6.0.8 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.6 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.4 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.2 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.5.0.2 pkgsrc-2004Q3-base:1.5 pkgsrc-2004Q2:1.4.0.2 pkgsrc-2004Q2-base:1.4 pkgsrc-2004Q1:1.2.0.2 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.1.0.4 pkgsrc-2003Q4-base:1.1 netbsd-1-6-1:1.1.0.2 netbsd-1-6-1-base:1.1; locks; strict; comment @# @; 1.14 date 2011.08.06.10.23.17; author wiz; state dead; branches; next 1.13; 1.13 date 2011.07.14.09.49.01; author drochner; state Exp; branches; next 1.12; 1.12 date 2009.12.15.11.08.38; author wiz; state dead; branches 1.12.4.1; next 1.11; 1.11 date 2009.06.08.09.30.17; author tron; state Exp; branches 1.11.2.1; next 1.10; 1.10 date 2009.02.21.13.20.45; author wiz; state dead; branches; next 1.9; 1.9 date 2008.04.07.15.36.19; author bjs; state Exp; branches; next 1.8; 1.8 date 2006.09.01.06.02.23; author adam; state Exp; branches; next 1.7; 1.7 date 2005.09.30.13.26.02; author adam; state Exp; branches; next 1.6; 1.6 date 2004.11.19.12.15.14; author adam; state Exp; branches; next 1.5; 1.5 date 2004.06.28.08.14.03; author adam; state Exp; branches; next 1.4; 1.4 date 2004.04.02.10.13.43; author adam; state Exp; branches; next 1.3; 1.3 date 2004.03.29.08.08.13; author adam; state Exp; branches; next 1.2; 1.2 date 2004.02.13.14.57.20; author adam; state Exp; branches; next 1.1; 1.1 date 2002.10.18.13.26.12; author jlam; state Exp; branches; next ; 1.12.4.1 date 2011.07.15.19.30.01; author spz; state Exp; branches; next ; 1.11.2.1 date 2009.06.08.09.30.17; author spz; state dead; branches; next 1.11.2.2; 1.11.2.2 date 2009.06.08.21.05.22; author spz; state Exp; branches; next ; desc @@ 1.14 log @Update to 1.0.25: (SA45125 was already fixed in the package) Version 1.0.25 (2011-07-13) * Fix for Secunia Advisory SA45125, heap overflow in PAF file handler. * Accept broken WAV files with blockalign == 0. * Minor bug fixes and improvements. @ text @$NetBSD: patch-ac,v 1.13 2011/07/14 09:49:01 drochner Exp $ SA45125 --- src/sndfile.c.orig 2011-03-23 09:01:02.000000000 +0000 +++ src/sndfile.c @@@@ -173,6 +173,7 @@@@ ErrorStruct SndfileErrors [] = { SFE_PAF_VERSION , "Error in PAF file, bad version." }, { SFE_PAF_UNKNOWN_FORMAT , "Error in PAF file, unknown format." }, { SFE_PAF_SHORT_HEADER , "Error in PAF file. File shorter than minimal header." }, + { SFE_PAF_BAD_CHANNELS , "Error in PAF file. Bad channel count." }, { SFE_SVX_NO_FORM , "Error in 8SVX / 16SV file, no 'FORM' marker." }, { SFE_SVX_NO_BODY , "Error in 8SVX / 16SV file, no 'BODY' marker." }, @ 1.13 log @add patch from upstream to fix crash by invalid PAF files (DOS problem, SA45125) bump PKGREV @ text @d1 1 a1 1 $NetBSD$ @ 1.12 log @Update to 1.0.21: Version 1.0.21 (2009-12-13) * Add a couple of new binary programs to programs/ dir. * Remove sndfile-jackplay (now in sndfile-tools package). * Add windows only function sf_wchar_open(). * Bunch of minor bug fixes. (The last entry sums up at least the DOS patches we had in pkgsrc.) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.11 2009/06/08 09:30:17 tron Exp $ d3 1 a3 1 Upstream fix for DoS vulnerability taken from here: d5 7 a11 22 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530831 --- src/htk.c.orig 2009-03-22 19:17:14.000000000 +0000 +++ src/htk.c 2009-06-08 10:03:02.000000000 +0100 @@@@ -195,10 +195,17 @@@@ return SFE_HTK_NOT_WAVEFORM ; psf->sf.channels = 1 ; - psf->sf.samplerate = 10000000 / sample_period ; - psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d => %d Hz\n", - sample_count, sample_period, psf->sf.samplerate) ; + if (sample_period > 0) + { psf->sf.samplerate = 10000000 / sample_period ; + psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d => %d Hz\n", + sample_count, sample_period, psf->sf.samplerate) ; + } + else + { psf->sf.samplerate = 16000 ; + psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d (should be > 0) => Guessed sample rate %d Hz\n", + sample_count, sample_period, psf->sf.samplerate) ; + } ; d13 2 a14 2 psf->sf.format = SF_FORMAT_HTK | SF_FORMAT_PCM_16 ; psf->bytewidth = 2 ; @ 1.12.4.1 log @Pullup ticket #3473 - requested by drochner audio/libsndfile security patch Revisions pulled up: - audio/libsndfile/Makefile 1.61 - audio/libsndfile/distinfo 1.33 - audio/libsndfile/patches/patch-aa 1.17 - audio/libsndfile/patches/patch-ab 1.11 - audio/libsndfile/patches/patch-ac 1.13 ------------------------------------------------------------------- Module Name: pkgsrc Committed By: drochner Date: Thu Jul 14 09:49:01 UTC 2011 Modified Files: pkgsrc/audio/libsndfile: Makefile distinfo Added Files: pkgsrc/audio/libsndfile/patches: patch-aa patch-ab patch-ac Log Message: add patch from upstream to fix crash by invalid PAF files (DOS problem, SA45125) bump PKGREV To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 pkgsrc/audio/libsndfile/Makefile cvs rdiff -u -r1.32 -r1.33 pkgsrc/audio/libsndfile/distinfo cvs rdiff -u -r0 -r1.17 pkgsrc/audio/libsndfile/patches/patch-aa cvs rdiff -u -r0 -r1.11 pkgsrc/audio/libsndfile/patches/patch-ab cvs rdiff -u -r0 -r1.13 pkgsrc/audio/libsndfile/patches/patch-ac @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 SA45125 d5 22 a26 7 --- src/sndfile.c.orig 2011-03-23 09:01:02.000000000 +0000 +++ src/sndfile.c @@@@ -173,6 +173,7 @@@@ ErrorStruct SndfileErrors [] = { SFE_PAF_VERSION , "Error in PAF file, bad version." }, { SFE_PAF_UNKNOWN_FORMAT , "Error in PAF file, unknown format." }, { SFE_PAF_SHORT_HEADER , "Error in PAF file. File shorter than minimal header." }, + { SFE_PAF_BAD_CHANNELS , "Error in PAF file. Bad channel count." }, d28 2 a29 2 { SFE_SVX_NO_FORM , "Error in 8SVX / 16SV file, no 'FORM' marker." }, { SFE_SVX_NO_BODY , "Error in 8SVX / 16SV file, no 'BODY' marker." }, @ 1.11 log @Add upstream patch (taken from Debian bug report) to fix crashes caused by bad audio files. @ text @d1 1 a1 1 $NetBSD$ @ 1.11.2.1 log @file patch-ac was added on branch pkgsrc-2009Q1 on 2009-06-08 21:05:22 +0000 @ text @d1 29 @ 1.11.2.2 log @Pullup ticket 2790 - requested by tron Security update Revisions pulled up: - pkgsrc/audio/libsndfile/Makefile 1.52 - pkgsrc/audio/libsndfile/distinfo 1.29 - pkgsrc/audio/libsndfile/options.mk 1.7 Files added: pkgsrc/audio/libsndfile/patches/patch-aa 1.15 pkgsrc/audio/libsndfile/patches/patch-ab 1.9 pkgsrc/audio/libsndfile/patches/patch-ac 1.11 pkgsrc/audio/libsndfile/patches/patch-ad 1.12 pkgsrc/audio/libsndfile/patches/patch-ae 1.7 pkgsrc/audio/libsndfile/patches/patch-af 1.7 Module Name: pkgsrc Committed By: wiz Date: Sat May 2 17:24:15 UTC 2009 Modified Files: pkgsrc/audio/libsndfile: options.mk Log Message: Add octave option, based on PR 41307 by Rumko. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/libsndfile/options.mk --------------------------------------------------------------------- Module Name: pkgsrc Committed By: adam Date: Thu May 14 12:58:27 UTC 2009 Modified Files: pkgsrc/audio/libsndfile: Makefile distinfo options.mk Log Message: Changes 1.0.20: * Fix potential heap overflow in VOC file parser. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 pkgsrc/audio/libsndfile/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/audio/libsndfile/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/audio/libsndfile/options.mk --------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Mon Jun 8 09:30:17 UTC 2009 Modified Files: pkgsrc/audio/libsndfile: Makefile distinfo Added Files: pkgsrc/audio/libsndfile/patches: patch-aa patch-ab patch-ac patch-ad patch-ae patch-af Log Message: Add upstream patch (taken from Debian bug report) to fix crashes caused by bad audio files. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 pkgsrc/audio/libsndfile/Makefile cvs rdiff -u -r1.28 -r1.29 pkgsrc/audio/libsndfile/distinfo cvs rdiff -u -r0 -r1.15 pkgsrc/audio/libsndfile/patches/patch-aa cvs rdiff -u -r0 -r1.9 pkgsrc/audio/libsndfile/patches/patch-ab cvs rdiff -u -r0 -r1.11 pkgsrc/audio/libsndfile/patches/patch-ac cvs rdiff -u -r0 -r1.12 pkgsrc/audio/libsndfile/patches/patch-ad cvs rdiff -u -r0 -r1.7 pkgsrc/audio/libsndfile/patches/patch-ae \ pkgsrc/audio/libsndfile/patches/patch-af @ text @a0 29 $NetBSD: patch-ac,v 1.11 2009/06/08 09:30:17 tron Exp $ Upstream fix for DoS vulnerability taken from here: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=530831 --- src/htk.c.orig 2009-03-22 19:17:14.000000000 +0000 +++ src/htk.c 2009-06-08 10:03:02.000000000 +0100 @@@@ -195,10 +195,17 @@@@ return SFE_HTK_NOT_WAVEFORM ; psf->sf.channels = 1 ; - psf->sf.samplerate = 10000000 / sample_period ; - psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d => %d Hz\n", - sample_count, sample_period, psf->sf.samplerate) ; + if (sample_period > 0) + { psf->sf.samplerate = 10000000 / sample_period ; + psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d => %d Hz\n", + sample_count, sample_period, psf->sf.samplerate) ; + } + else + { psf->sf.samplerate = 16000 ; + psf_log_printf (psf, "HTK Waveform file\n Sample Count : %d\n Sample Period : %d (should be > 0) => Guessed sample rate %d Hz\n", + sample_count, sample_period, psf->sf.samplerate) ; + } ; psf->sf.format = SF_FORMAT_HTK | SF_FORMAT_PCM_16 ; psf->bytewidth = 2 ; @ 1.10 log @Update to 1.0.18: Version 1.0.18 (2009-02-07) * Add Ogg/Vorbis support (thanks to John ffitch). * Remove captive FLAC library. * Many new features and bug fixes. * Generate Win32 and Win64 pre-compiled binaries. Add ogg and vorbis dependencies to bl3.mk and increase ABI depends. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.9 2008/04/07 15:36:19 bjs Exp $ d3 24 a26 82 --- examples/sndfile-play.c.orig 2006-08-31 05:22:07.000000000 -0400 +++ 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 (USE_SUN) #include #include #include @@@@ -339,7 +344,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) ; @@@@ -408,7 +413,7 @@@@ static int linux_open_dsp_device (int channels, int srate) { int fd, stereo, fmt ; - 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) ; @@@@ -819,7 +824,12 @@@@ win32_play (int argc, char *argv []) ** Solaris. */ -#if (defined (sun) && defined (unix)) /* ie Solaris */ +#if (defined (sun) && defined (unix)) || \ + defined (USE_SUN) + +#ifndef SUN_DEV +#define SUN_DEV "/dev/audio" +#endif static void solaris_play (int argc, char *argv []) @@@@ -844,8 +854,8 @@@@ solaris_play (int argc, char *argv []) } ; /* open the audio device - write only, non-blocking */ - if ((audio_fd = open ("/dev/audio", O_WRONLY | O_NONBLOCK)) < 0) - { perror ("open (/dev/audio) failed") ; + if ((audio_fd = open (SUN_DEV, O_WRONLY | O_NONBLOCK)) < 0) + { perror ("open ("SUN_DEV") failed") ; return ; } ; @@@@ -858,6 +868,9 @@@@ solaris_play (int argc, char *argv []) audio_info.play.encoding = AUDIO_ENCODING_LINEAR ; audio_info.play.gain = AUDIO_MAX_GAIN ; audio_info.play.balance = AUDIO_MID_BALANCE ; +#if defined(__NetBSD__) || defined(__OpenBSD__) + audio_info.mode = AUMODE_PLAY | AUMODE_PLAY_ALL; +#endif if ((error = ioctl (audio_fd, AUDIO_SETINFO, &audio_info))) { perror ("ioctl (AUDIO_SETINFO) failed") ; @@@@ -926,7 +939,7 @@@@ main (int argc, char *argv []) return 1 ; } ; d28 2 a29 15 -#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) ; @@@@ -935,7 +948,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 (USE_SUN) solaris_play (argc, argv) ; #elif (OS_IS_WIN32 == 1) win32_play (argc, argv) ; @ 1.9 log @ Add a 'sun' option and update patch-ac to support native audio output on NetBSD, OpenBSD, and Solaris. This option takes precedence (by default) over OSS in the NetBSD/OpenBSD case. Bump rev. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2006/09/01 06:02:23 adam Exp $ @ 1.8 log @Changes 1.0.17: * Add sndfile.hh C++ wrapper. * Update Win32 MinGW build instructions. * Minor bug fixes and cleanups. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- examples/sndfile-play.c.orig 2006-08-31 11:22:07.000000000 +0200 d25 1 a25 1 + (defined (__NetBSD__) && !defined(USE_OSS)) d47 1 a47 1 @@@@ -819,7 +824,8 @@@@ win32_play (int argc, char *argv []) d53 5 a57 1 + (defined (__NetBSD__) && !defined(USE_OSS)) d61 22 a82 1 @@@@ -926,7 +932,7 @@@@ main (int argc, char *argv []) d91 1 a91 1 @@@@ -935,7 +941,8 @@@@ main (int argc, char *argv []) d97 1 a97 1 + (defined (__NetBSD__) && !defined(USE_OSS)) @ 1.7 log @Changes 1.0.12: * Add support for FLAC and Apple's Core Audio Format (CAF). * Add virtual I/O interface (still needs docs). * Cygwin and other Win32 fixes. * Minor bug fixes and cleanups. @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2005-09-04 00:11:38.000000000 +0000 d40 1 a40 1 { int fd, stereo, temp, error ; @ 1.6 log @Changes 1.0.11: * Add SD2 file support * Reading of loop data in WAV and AIFF * Minor bug fixes @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2004-11-14 19:57:17.000000000 +0000 d29 1 a29 1 @@@@ -324,7 +329,7 @@@@ alsa_write_float (snd_pcm_t *alsa_dev, f d38 1 a38 1 @@@@ -387,7 +392,7 @@@@ static int d47 1 a47 1 @@@@ -798,7 +803,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -905,7 +911,7 @@@@ main (int argc, char *argv []) d66 1 a66 1 @@@@ -914,7 +920,8 @@@@ main (int argc, char *argv []) @ 1.5 log @Changes 1.0.10: * Minor bug fixes * Fix support for Win32 MinGW compiler @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2004-06-16 10:17:04.000000000 +0000 d29 1 a29 1 @@@@ -326,7 +331,7 @@@@ alsa_write_float (snd_pcm_t *alsa_dev, f d38 1 a38 1 @@@@ -389,7 +394,7 @@@@ static int d47 1 a47 1 @@@@ -762,7 +767,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -869,7 +875,7 @@@@ main (int argc, char *argv []) d66 1 a66 1 @@@@ -878,7 +884,8 @@@@ main (int argc, char *argv []) @ 1.4 log @Changes 1.0.9: * Add AVR format * Improve handling of some WAV files @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2004-03-17 09:39:29.000000000 +0000 d29 1 a29 1 @@@@ -328,7 +333,7 @@@@ alsa_write_float (snd_pcm_t *alsa_dev, f d38 1 a38 1 @@@@ -391,7 +396,7 @@@@ static int d45 1 a45 1 { perror("linux_open_dsp_device : open ") ; d47 1 a47 1 @@@@ -757,7 +762,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -864,7 +870,7 @@@@ main (int argc, char *argv []) d66 1 a66 1 @@@@ -873,7 +879,8 @@@@ main (int argc, char *argv []) d74 1 a74 1 #elif WIN32_WITH_MMREG_H @ 1.3 log @Changes 1.0.8: * Minor bug fixes @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2004-03-14 08:34:32.000000000 +0000 d5 2 a6 2 @@@@ -27,16 +27,21 @@@@ #include d29 1 a29 1 @@@@ -58,7 +63,7 @@@@ d38 1 a38 1 @@@@ -121,7 +126,7 @@@@ static int d47 1 a47 1 @@@@ -487,7 +492,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -594,7 +600,7 @@@@ main (int argc, char *argv []) d62 2 a63 2 +#if defined (__linux__) || defined(USE_OSS) #if (defined (HAVE_ALSA) && HAVE_ALSA) d66 2 a67 2 @@@@ -603,7 +609,8 @@@@ main (int argc, char *argv []) #endif @ 1.2 log @Changes 1.0.6: Large file fix for Linux/Solaris New functionality and Win32 improvements @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig 2004-02-05 09:35:42.000000000 +0000 d29 1 a29 1 @@@@ -57,7 +62,7 @@@@ d38 1 a38 1 @@@@ -120,7 +125,7 @@@@ static int d47 1 a47 1 @@@@ -486,7 +491,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -593,7 +599,7 @@@@ main (int argc, char *argv []) d66 1 a66 1 @@@@ -602,7 +608,8 @@@@ main (int argc, char *argv []) d74 1 a74 1 #elif (defined (_WIN32) || defined (WIN32)) @ 1.1 log @Make this package OSS-aware. @ text @d3 1 a3 1 --- examples/sndfile-play.c.orig Mon Aug 5 18:50:55 2002 d5 3 a7 3 @@@@ -20,16 +20,21 @@@@ #include #include d29 1 a29 1 @@@@ -49,7 +54,7 @@@@ d38 1 a38 1 @@@@ -110,7 +115,7 @@@@ static int d42 3 a44 2 - if ((fd = open ("/dev/dsp", O_WRONLY, 0)) == -1) + if ((fd = open (DEV_DSP, O_WRONLY, 0)) == -1) d47 1 a47 2 } ; @@@@ -468,7 +473,8 @@@@ win32_play (int argc, char *argv []) d57 1 a57 1 @@@@ -562,11 +568,12 @@@@ main (int argc, char *argv []) d63 5 a67 1 linux_play (argc, argv) ; @