[Iaxclient-cvs] iaxclient/lib/portaudio/pablio pablio.c,1.3,1.4 pablio.h,1.2,1.3

[<st...@us...>]

Update of /cvsroot/iaxclient/iaxclient/lib/portaudio/pablio
In directory sc8-pr-cvs1:/tmp/cvs-serv11667

Modified Files:
	pablio.c pablio.h 
Log Message:
revert changes.

They broke on Win32 (probably need to init Pablio before I can get
default devices?), plus, we may never use the new entrypoint.


Index: pablio.c
===================================================================
RCS file: /cvsroot/iaxclient/iaxclient/lib/portaudio/pablio/pablio.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pablio.c	16 Jun 2003 15:02:58 -0000	1.3
+++ pablio.c	16 Jun 2003 22:02:38 -0000	1.4
@@ -193,9 +193,8 @@
  *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
  *    and either PABLIO_MONO or PABLIO_STEREO
  */
-PaError OpenAudioStreamByID( PABLIO_Stream **rwblPtr, double sampleRate,
-                         PaSampleFormat format, long flags ,
-			 PaDeviceID inID, PaDeviceID outID)
+PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
+                         PaSampleFormat format, long flags )
 {
     long   bytesPerSample;
     long   doRead = 0;
@@ -265,11 +264,11 @@
      * audio drivers. */
     err = Pa_OpenStream(
               &aStream->stream,
-              (doRead ? inID : paNoDevice),
+              (doRead ? Pa_GetDefaultInputDeviceID() : paNoDevice),
               (doRead ? aStream->samplesPerFrame : 0 ),
               format,
               NULL,
-              (doWrite ? outID : paNoDevice),
+              (doWrite ? Pa_GetDefaultOutputDeviceID() : paNoDevice),
               (doWrite ? aStream->samplesPerFrame : 0 ),
               format,
               NULL,
@@ -291,14 +290,6 @@
     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.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pablio.h	16 Jun 2003 14:47:44 -0000	1.2
+++ pablio.h	16 Jun 2003 22:02:38 -0000	1.3
@@ -101,13 +101,6 @@
 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