Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17779
Modified Files: Tag: desiredata s_audio_oss.c Log Message: cleanup
Index: s_audio_oss.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_oss.c,v retrieving revision 1.6.4.2.2.2.2.1 retrieving revision 1.6.4.2.2.2.2.2 diff -C2 -d -r1.6.4.2.2.2.2.1 -r1.6.4.2.2.2.2.2 *** s_audio_oss.c 20 Dec 2006 08:28:13 -0000 1.6.4.2.2.2.2.1 --- s_audio_oss.c 28 Jun 2007 06:19:19 -0000 1.6.4.2.2.2.2.2 *************** *** 37,54 **** typedef int32_t t_oss_int32; #define OSS_MAXSAMPLEWIDTH sizeof(t_oss_int32) ! #define OSS_BYTESPERCHAN(width) (sys_dacblocksize * (width)) #define OSS_XFERSAMPS(chans) (sys_dacblocksize* (chans)) #define OSS_XFERSIZE(chans, width) (sys_dacblocksize * (chans) * (width))
- /* GLOBALS */ - static int linux_meters; /* true if we're metering */ - static float linux_inmax; /* max input amplitude */ - static float linux_outmax; /* max output amplitude */ [...1039 lines suppressed...] ! ndev = maxndev; ! for (i = 0; i < ndev; i++) ! { sprintf(indevlist + i * devdescsize, "OSS device #%d", i+1); sprintf(outdevlist + i * devdescsize, "OSS device #%d", i+1); --- 670,683 ---- } } ! thischan += nchannels; } ! return rtnval; }
! void oss_getdevs(char *indevlist, int *nindevs, char *outdevlist, int *noutdevs, int *canmulti, int maxndev, int devdescsize) { int i, ndev; *canmulti = 2; /* supports multiple devices */ ! if ((ndev = oss_ndev) > maxndev) ndev = maxndev; ! for (i = 0; i < ndev; i++) { sprintf(indevlist + i * devdescsize, "OSS device #%d", i+1); sprintf(outdevlist + i * devdescsize, "OSS device #%d", i+1);