From: <st...@us...> - 2003-06-16 14:47:48
|
Update of /cvsroot/iaxclient/iaxclient/lib/portaudio/pablio In directory sc8-pr-cvs1:/tmp/cvs-serv31709/pablio Modified Files: pablio.c pablio.h Log Message: add ability to open Pablio while specifying deviceIDs for input/output Index: pablio.c =================================================================== RCS file: /cvsroot/iaxclient/iaxclient/lib/portaudio/pablio/pablio.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pablio.c 14 Apr 2003 23:47:16 -0000 1.1 +++ pablio.c 16 Jun 2003 14:47:44 -0000 1.2 @@ -193,8 +193,9 @@ * PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE, * and either PABLIO_MONO or PABLIO_STEREO */ -PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate, - PaSampleFormat format, long flags ) +PaError OpenAudioStreamByID( PABLIO_Stream **rwblPtr, double sampleRate, + PaSampleFormat format, long flags , + PaDeviceID inID, PaDeviceID outID) { long bytesPerSample; long doRead = 0; @@ -264,11 +265,11 @@ * audio drivers. */ err = Pa_OpenStream( &aStream->stream, - (doRead ? Pa_GetDefaultInputDeviceID() : paNoDevice), + (doRead ? inID : paNoDevice), (doRead ? aStream->samplesPerFrame : 0 ), format, NULL, - (doWrite ? Pa_GetDefaultOutputDeviceID() : paNoDevice), + (doWrite ? outID : paNoDevice), (doWrite ? aStream->samplesPerFrame : 0 ), format, NULL, @@ -290,6 +291,14 @@ CloseAudioStream( aStream ); *rwblPtr = NULL; return err; +} + +PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate, + PaSampleFormat format, long flags ) +{ + return OpenAudioStreamByID(rwblPtr, samplerate, format, flags, + Pa_GetDefaultInputDeviceID(), + Pa_GetDefaultOutputDeviceID()); } /************************************************************/ Index: pablio.h =================================================================== RCS file: /cvsroot/iaxclient/iaxclient/lib/portaudio/pablio/pablio.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pablio.h 14 Apr 2003 23:47:16 -0000 1.1 +++ pablio.h 16 Jun 2003 14:47:44 -0000 1.2 @@ -101,6 +101,13 @@ PaError OpenAudioStream( PABLIO_Stream **aStreamPtr, double sampleRate, PaSampleFormat format, long flags ); +/* same as OpenAudioStream, except you can specify DeviceIDs for input + * and output devices Added for IAXCLIENT */ +PaError OpenAudioStreamByID( PABLIO_Stream **rwblPtr, double sampleRate, + PaSampleFormat format, long flags , + PaDeviceID inID, PaDeviceID outID); + + PaError CloseAudioStream( PABLIO_Stream *aStream ); #ifdef __cplusplus |