Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12341
Modified Files: Tag: devel_0_38 s_audio.c s_audio_pa.c s_stuff.h Log Message: small api change ...
Index: s_audio_pa.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** s_audio_pa.c 15 May 2005 15:50:20 -0000 1.4.4.5 --- s_audio_pa.c 15 May 2005 19:03:37 -0000 1.4.4.6 *************** *** 52,57 **** PaStreamCallbackFlags statusFlags, void *userData);
! int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin, ! t_sample *soundout, int advance, int indeviceno, int outdeviceno, int schedmode) { --- 52,56 ---- PaStreamCallbackFlags statusFlags, void *userData);
! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode) { *************** *** 159,162 **** --- 158,168 ---- paClipOff, /* tb: we should be faster ;-) */ pa_callback, NULL); + + if (err == paNoError) + { + const PaStreamInfo * streaminfo = Pa_GetStreamInfo (pa_stream); + sys_schedadvance = 1e6 * streaminfo->outputLatency; + } + #ifndef PABLOCKING }
Index: s_audio.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio.c,v retrieving revision 1.5.4.15 retrieving revision 1.5.4.16 diff -C2 -d -r1.5.4.15 -r1.5.4.16 *** s_audio.c 15 May 2005 18:51:15 -0000 1.5.4.15 --- s_audio.c 15 May 2005 19:03:37 -0000 1.5.4.16 *************** *** 331,336 **** { int blksize = (sys_blocksize ? sys_blocksize : 64); ! pa_open_audio(inchans, outchans, rate, sys_soundin, sys_soundout, ! advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0), --- 331,335 ---- { int blksize = (sys_blocksize ? sys_blocksize : 64); ! pa_open_audio(inchans, outchans, rate, advance, (naudiooutdev > 0 ? audioindev[0] : 0), (naudiooutdev > 0 ? audiooutdev[0] : 0),
Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.9 retrieving revision 1.5.4.10 diff -C2 -d -r1.5.4.9 -r1.5.4.10 *** s_stuff.h 15 May 2005 18:51:15 -0000 1.5.4.9 --- s_stuff.h 15 May 2005 19:03:37 -0000 1.5.4.10 *************** *** 207,212 **** #endif
! int pa_open_audio(int inchans, int outchans, int rate, t_sample *soundin, ! t_sample *soundout, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void); --- 207,211 ---- #endif
! int pa_open_audio(int inchans, int outchans, int rate, int advance, int indeviceno, int outdeviceno, int schedmode); void pa_close_audio(void);