This commit was generated by cvs2svn to compensate for changes in r610,

which included commits to RCS files with non-trunk default branches.

svn path=/trunk/; revision=611

5 files changed, 31 insertions, 29 deletions

diff --git a/pd/portaudio/pablio/pablio.h b/pd/portaudio/pablio/pablio.h
index 9060c560..85843ae9 100644
--- a/pd/portaudio/pablio/pablio.h
+++ b/pd/portaudio/pablio/pablio.h
@@ -7,7 +7,7 @@ extern "C"
 #endif /* __cplusplus */
 
 /*
- * $Id: pablio.h,v 1.1.1.1 2002-07-29 17:06:17 ggeiger Exp $
+ * $Id: pablio.h,v 1.1.1.2 2003-05-09 16:03:59 ggeiger Exp $
  * PABLIO.h
  * Portable Audio Blocking read/write utility.
  *
@@ -96,8 +96,9 @@ long GetAudioStreamReadable( PABLIO_Stream *aStream );
  *
  * flags parameter can be an ORed combination of:
  *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
+ *    and either PABLIO_MONO or PABLIO_STEREO
  */
-PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
+PaError OpenAudioStream( PABLIO_Stream **aStreamPtr, double sampleRate,
                          PaSampleFormat format, long flags );
 
 PaError CloseAudioStream( PABLIO_Stream *aStream );
diff --git a/pd/portaudio/pablio/pablio_pd.c b/pd/portaudio/pablio/pablio_pd.c
index e7105e9b..49323ef1 100644
--- a/pd/portaudio/pablio/pablio_pd.c
+++ b/pd/portaudio/pablio/pablio_pd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: pablio_pd.c,v 1.1.1.1 2002-07-29 17:06:17 ggeiger Exp $
+ * $Id: pablio_pd.c,v 1.1.1.2 2003-05-09 16:03:59 ggeiger Exp $
  * pablio.c
  * Portable Audio Blocking Input/Output utility.
  *
@@ -54,7 +54,9 @@
 
 static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
                                unsigned long framesPerBuffer,
-                               PaTimestamp outTime, void *userData );
+                               const PaStreamCallbackTimeInfo *outTime, 
+                               PaStreamCallbackFlags myflags, 
+			       void *userData );
 static PaError PABLIO_InitFIFO( RingBuffer *rbuf, long numFrames, long bytesPerFrame );
 static PaError PABLIO_TermFIFO( RingBuffer *rbuf );
 
@@ -67,7 +69,9 @@ static PaError PABLIO_TermFIFO( RingBuffer *rbuf );
  */
 static int blockingIOCallback( void *inputBuffer, void *outputBuffer,
                                unsigned long framesPerBuffer,
-                               PaTimestamp outTime, void *userData )
+                               const PaStreamCallbackTimeInfo *outTime, 
+                               PaStreamCallbackFlags myflags, 
+			       void *userData )
 {
     PABLIO_Stream *data = (PABLIO_Stream*)userData;
     long numBytes = data->bytesPerFrame * framesPerBuffer;
@@ -198,6 +202,7 @@ PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
     long   doWrite = 0;
     PaError err;
     PABLIO_Stream *aStream;
+    PaStreamParameters instreamparams, outstreamparams;  /* MSP */
     long   minNumBuffers;
     long   numFrames;
 
@@ -208,16 +213,16 @@ PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
 
     if (indeviceno < 0)  /* MSP... */
     {
-	indeviceno = Pa_GetDefaultInputDeviceID();
+	indeviceno = Pa_GetDefaultInputDevice();
 	fprintf(stderr, "using default input device number: %d\n", indeviceno);
     }
     if (outdeviceno < 0)
     {
-	outdeviceno = Pa_GetDefaultOutputDeviceID();
+	outdeviceno = Pa_GetDefaultOutputDevice();
 	fprintf(stderr, "using default output device number: %d\n", outdeviceno);
     }
     nbuffers = RoundUpToNextPowerOf2(nbuffers);
-    fprintf(stderr, "nchan %d, flags %d, bufs %d, framesperbuf %d\n",
+    fprintf(stderr, "nchan %d, flags %ld, bufs %d, framesperbuf %d\n",
 	    nchannels, flags, nbuffers, framesperbuf);
     	/* ...MSP */
 
@@ -236,19 +241,22 @@ PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
     aStream->samplesPerFrame = nchannels;  /* MSP */
     aStream->bytesPerFrame = bytesPerSample * aStream->samplesPerFrame;
 
-    /* Initialize PortAudio  */
-    err = Pa_Initialize();
-    if( err != paNoError ) goto error;
 
-/* Warning: numFrames must be larger than amount of data processed per
-  interrupt inside PA to prevent glitches. */  /* MSP */
-    minNumBuffers = Pa_GetMinNumBuffers(framesperbuf, sampleRate);
-    if (minNumBuffers > nbuffers)
-	fprintf(stderr,
-	"warning: number of buffers %d less than recommended minimum %d\n",
-	    (int)nbuffers, (int)minNumBuffers);
     numFrames = nbuffers * framesperbuf;
 
+    instreamparams.device = indeviceno;   /* MSP */
+    instreamparams.channelCount = nchannels;
+    instreamparams.sampleFormat = format;
+    instreamparams.suggestedLatency = nbuffers*framesperbuf/sampleRate;
+    instreamparams.hostApiSpecificStreamInfo = 0;
+    
+    outstreamparams.device = outdeviceno;
+    outstreamparams.channelCount = nchannels;
+    outstreamparams.sampleFormat = format;
+    outstreamparams.suggestedLatency = nbuffers*framesperbuf/sampleRate;
+    outstreamparams.hostApiSpecificStreamInfo = 0;
+    
+    
     /* Initialize Ring Buffers */
     doRead = ((flags & PABLIO_READ) != 0);
     doWrite = ((flags & PABLIO_WRITE) != 0);
@@ -271,17 +279,10 @@ PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
      * audio drivers. */
     err = Pa_OpenStream(
               &aStream->stream,
-              (doRead ? indeviceno : paNoDevice),  /* MSP */
-              (doRead ? aStream->samplesPerFrame : 0 ),
-              format,
-              NULL,
-              (doWrite ? outdeviceno : paNoDevice),  /* MSP */
-              (doWrite ? aStream->samplesPerFrame : 0 ),
-              format,
-              NULL,
+              (doRead ? &instreamparams : 0),  /* MSP */
+              (doWrite ? &outstreamparams : 0),  /* MSP */
               sampleRate,
 	      framesperbuf,  /* MSP */
-	      nbuffers,      /* MSP */
 	      paNoFlag,      /* MSP -- portaudio will clip for us */
               blockingIOCallback,
               aStream );
diff --git a/pd/portaudio/pablio/pablio_pd.h b/pd/portaudio/pablio/pablio_pd.h
index b87b9f5a..8f8a688a 100644
--- a/pd/portaudio/pablio/pablio_pd.h
+++ b/pd/portaudio/pablio/pablio_pd.h
@@ -7,7 +7,7 @@ extern "C"
 #endif /* __cplusplus */
 
 /*
- * $Id: pablio_pd.h,v 1.1.1.1 2002-07-29 17:06:17 ggeiger Exp $
+ * $Id: pablio_pd.h,v 1.1.1.2 2003-05-09 16:03:59 ggeiger Exp $
  * PABLIO.h
  * Portable Audio Blocking read/write utility.
  *
@@ -53,7 +53,7 @@ typedef struct
 {
     RingBuffer   inFIFO;
     RingBuffer   outFIFO;
-    PortAudioStream *stream;
+    PaStream *stream;      /* MSP -- was PortAudioStream; probably an error */
     int          bytesPerFrame;
     int          samplesPerFrame;
 }
diff --git a/pd/portaudio/pablio/pablio_pd.o b/pd/portaudio/pablio/pablio_pd.o
new file mode 100644
index 00000000..359a8c49
--- /dev/null
+++ b/pd/portaudio/pablio/pablio_pd.o
diff --git a/pd/portaudio/pablio/ringbuffer_pd.o b/pd/portaudio/pablio/ringbuffer_pd.o
new file mode 100644
index 00000000..a348b1ed
--- /dev/null
+++ b/pd/portaudio/pablio/ringbuffer_pd.o