[Python-checkins] CVS: python/dist/src/Modules linuxaudiodev.c,2.6,2.7

Jeremy Hylton python-dev@python.org
Thu, 31 Aug 2000 11:11:16 -0700


Update of /cvsroot/python/python/dist/src/Modules
In directory slayer.i.sourceforge.net:/tmp/cvs-serv10203/Modules

Modified Files:
	linuxaudiodev.c 
Log Message:
This module has a poor name, since it can be used under FreeBSD and
Linux.  Perhaps winaudio would be better, as it would offend both
parties equally.

tg@freebsd.org: allow this module to compile under FreeBSD
(he suggests voxwareaudio)


Index: linuxaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/linuxaudiodev.c,v
retrieving revision 2.6
retrieving revision 2.7
diff -C2 -r2.6 -r2.7
*** linuxaudiodev.c	2000/08/18 05:10:45	2.6
--- linuxaudiodev.c	2000/08/31 18:11:07	2.7
***************
*** 28,34 ****
--- 28,44 ----
  
  #include <sys/ioctl.h>
+ #if defined(linux)
  #include <linux/soundcard.h>
  
  typedef unsigned long uint32_t;
+ 
+ #elif defined(__FreeBSD__)
+ #include <machine/soundcard.h>
+ 
+ #ifndef SNDCTL_DSP_CHANNELS
+ #define SNDCTL_DSP_CHANNELS SOUND_PCM_WRITE_CHANNELS
+ #endif
+ 
+ #endif
  
  typedef struct {