Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18736/srcd
Modified Files:
Tag: devel_0_37
s_audio_pa.c
Log Message:
non-MSVC ASIO & multi-dev fix
Index: s_audio_pa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v
retrieving revision 1.1.1.1.2.6
retrieving revision 1.1.1.1.2.7
diff -C2 -d -r1.1.1.1.2.6 -r1.1.1.1.2.7
*** s_audio_pa.c 14 Jan 2004 15:50:28 -0000 1.1.1.1.2.6
--- s_audio_pa.c 13 Sep 2004 13:22:52 -0000 1.1.1.1.2.7
***************
*** 56,61 ****
}
/* post("in %d out %d rate %d device %d", inchans, outchans, rate, deviceno); */
- if (inchans != 0 && outchans != 0 && inchans != outchans)
- error("portaudio: number of input and output channels must match");
if (inchans > MAX_PA_CHANS)
{
--- 56,59 ----
***************
*** 111,123 ****
if (inchans && outchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_READ_WRITE, inchans, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else if (inchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_READ, inchans, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else if (outchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_WRITE, outchans, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else err = 0;
--- 109,121 ----
if (inchans && outchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_READ_WRITE, inchans, outchans, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else if (inchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_READ, inchans, 0, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else if (outchans)
err = OpenAudioStream( &pa_stream, rate, paFloat32,
! PABLIO_WRITE, 0, outchans, framesperbuf, nbuffers,
pa_indev, pa_outdev);
else err = 0;