From d156c2d782d1c598a4c97bc5192f383ce9669674 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 2 Feb 2003 17:59:06 +0000 Subject: [PATCH] Get ossaudiodev to compile on freebsd 4.7 --- Modules/ossaudiodev.c | 18 ++++++++++++++++++ setup.py | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index ccc7882f428..727f5a6213e 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -76,7 +76,9 @@ static struct { { 16, AFMT_U16_LE, "linear unsigned 16-bit little-endian audio" }, { 16, AFMT_S16_BE, "linear signed 16-bit big-endian audio" }, { 16, AFMT_S16_LE, "linear signed 16-bit little-endian audio" }, +#ifdef AFMT_S16_NE { 16, AFMT_S16_NE, "linear signed 16-bit native-endian audio" }, +#endif }; static int n_audio_types = sizeof(audio_types) / sizeof(audio_types[0]); @@ -963,7 +965,9 @@ initossaudiodev(void) _EXPORT_INT(m, AFMT_U16_BE); _EXPORT_INT(m, AFMT_MPEG); _EXPORT_INT(m, AFMT_AC3); +#ifdef AFMT_S16_NE _EXPORT_INT(m, AFMT_S16_NE); +#endif /* Expose the sound mixer device numbers. */ _EXPORT_INT(m, SOUND_MIXER_NRDEVICES); @@ -1005,11 +1009,15 @@ initossaudiodev(void) _EXPORT_INT(m, SNDCTL_COPR_SENDMSG); _EXPORT_INT(m, SNDCTL_COPR_WCODE); _EXPORT_INT(m, SNDCTL_COPR_WDATA); +#ifdef SNDCTL_DSP_BIND_CHANNEL _EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL); +#endif _EXPORT_INT(m, SNDCTL_DSP_CHANNELS); _EXPORT_INT(m, SNDCTL_DSP_GETBLKSIZE); _EXPORT_INT(m, SNDCTL_DSP_GETCAPS); +#ifdef SNDCTL_DSP_GETCHANNELMASK _EXPORT_INT(m, SNDCTL_DSP_GETCHANNELMASK); +#endif _EXPORT_INT(m, SNDCTL_DSP_GETFMTS); _EXPORT_INT(m, SNDCTL_DSP_GETIPTR); _EXPORT_INT(m, SNDCTL_DSP_GETISPACE); @@ -1024,7 +1032,9 @@ initossaudiodev(void) _EXPORT_INT(m, SNDCTL_DSP_MAPOUTBUF); _EXPORT_INT(m, SNDCTL_DSP_NONBLOCK); _EXPORT_INT(m, SNDCTL_DSP_POST); +#ifdef SNDCTL_DSP_PROFILE _EXPORT_INT(m, SNDCTL_DSP_PROFILE); +#endif _EXPORT_INT(m, SNDCTL_DSP_RESET); _EXPORT_INT(m, SNDCTL_DSP_SAMPLESIZE); _EXPORT_INT(m, SNDCTL_DSP_SETDUPLEX); @@ -1048,7 +1058,9 @@ initossaudiodev(void) _EXPORT_INT(m, SNDCTL_SEQ_CTRLRATE); _EXPORT_INT(m, SNDCTL_SEQ_GETINCOUNT); _EXPORT_INT(m, SNDCTL_SEQ_GETOUTCOUNT); +#ifdef SNDCTL_SEQ_GETTIME _EXPORT_INT(m, SNDCTL_SEQ_GETTIME); +#endif _EXPORT_INT(m, SNDCTL_SEQ_NRMIDIS); _EXPORT_INT(m, SNDCTL_SEQ_NRSYNTHS); _EXPORT_INT(m, SNDCTL_SEQ_OUTOFBAND); @@ -1059,11 +1071,17 @@ initossaudiodev(void) _EXPORT_INT(m, SNDCTL_SEQ_SYNC); _EXPORT_INT(m, SNDCTL_SEQ_TESTMIDI); _EXPORT_INT(m, SNDCTL_SEQ_THRESHOLD); +#ifdef SNDCTL_SYNTH_CONTROL _EXPORT_INT(m, SNDCTL_SYNTH_CONTROL); +#endif +#ifdef SNDCTL_SYNTH_ID _EXPORT_INT(m, SNDCTL_SYNTH_ID); +#endif _EXPORT_INT(m, SNDCTL_SYNTH_INFO); _EXPORT_INT(m, SNDCTL_SYNTH_MEMAVL); +#ifdef SNDCTL_SYNTH_REMOVESAMPLE _EXPORT_INT(m, SNDCTL_SYNTH_REMOVESAMPLE); +#endif _EXPORT_INT(m, SNDCTL_TMR_CONTINUE); _EXPORT_INT(m, SNDCTL_TMR_METRONOME); _EXPORT_INT(m, SNDCTL_TMR_SELECT); diff --git a/setup.py b/setup.py index 6f2d34e2782..38d606600f1 100644 --- a/setup.py +++ b/setup.py @@ -742,8 +742,9 @@ class PyBuildExt(build_ext): # Linux-specific modules exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) ) + if platform in ('linux2', 'freebsd4'): # ossaudiodev currently doesn't work, so don't build. -## # XXX should also build this on FreeBSD! + pass ## exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) if platform == 'sunos5':