[PD-cvs] pd/src s_audio_pa.c, 1.4.4.7.2.4, 1.4.4.7.2.5 s_audio_pablio.c, 1.1.4.2.2.3, 1.1.4.2.2.4 s_audio_pablio.h, 1.1.4.1.2.2, 1.1.4.1.2.3 s_audio_paring.c, 1.1.4.1, 1.1.4.1.2.1 s_audio_paring.h, 1.1.4.1.2.2, 1.1.4.1.2.3

Thomas Grill xovo at users.sourceforge.net
Tue Jan 24 02:29:56 CET 2006


Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7561/src

Modified Files:
      Tag: devel_0_39
	s_audio_pa.c s_audio_pablio.c s_audio_pablio.h 
	s_audio_paring.c s_audio_paring.h 
Log Message:
fix portaudio name clash by renaming the PD portaudio-related functions

Index: s_audio_pablio.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_pablio.c,v
retrieving revision 1.1.4.2.2.3
retrieving revision 1.1.4.2.2.4
diff -C2 -d -r1.1.4.2.2.3 -r1.1.4.2.2.4
*** s_audio_pablio.c	30 Nov 2005 13:36:58 -0000	1.1.4.2.2.3
--- s_audio_pablio.c	24 Jan 2006 01:29:54 -0000	1.1.4.2.2.4
***************
*** 98,102 ****
      if( inputBuffer != NULL )
      {
!         RingBuffer_Write( &data->inFIFO, inputBuffer,
  	    data->inbytesPerFrame * framesPerBuffer );
      }
--- 98,102 ----
      if( inputBuffer != NULL )
      {
!         PD_RingBuffer_Write( &data->inFIFO, inputBuffer,
  	    data->inbytesPerFrame * framesPerBuffer );
      }
***************
*** 105,109 ****
          int i;
  	int numBytes = data->outbytesPerFrame * framesPerBuffer;
!         int numRead = RingBuffer_Read( &data->outFIFO, outputBuffer,
  	    numBytes);
          /* Zero out remainder of buffer if we run out of data. */
--- 105,109 ----
          int i;
  	int numBytes = data->outbytesPerFrame * framesPerBuffer;
!         int numRead = PD_RingBuffer_Read( &data->outFIFO, outputBuffer,
  	    numBytes);
          /* Zero out remainder of buffer if we run out of data. */
***************
*** 124,128 ****
      if( buffer == NULL ) return paInsufficientMemory;
      memset( buffer, 0, numBytes );
!     return (PaError) RingBuffer_Init( rbuf, numBytes, buffer );
  }
  
--- 124,128 ----
      if( buffer == NULL ) return paInsufficientMemory;
      memset( buffer, 0, numBytes );
!     return (PaError) PD_RingBuffer_Init( rbuf, numBytes, buffer );
  }
  
***************
*** 139,143 ****
   * Will not return until all the data has been written.
   */
! long WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
  {
      long bytesWritten;
--- 139,143 ----
   * Will not return until all the data has been written.
   */
! long PD_WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
  {
      long bytesWritten;
***************
*** 146,150 ****
      while( numBytes > 0)
      {
!         bytesWritten = RingBuffer_Write( &aStream->outFIFO, p, numBytes );
          numBytes -= bytesWritten;
          p += bytesWritten;
--- 146,150 ----
      while( numBytes > 0)
      {
!         bytesWritten = PD_RingBuffer_Write( &aStream->outFIFO, p, numBytes );
          numBytes -= bytesWritten;
          p += bytesWritten;
***************
*** 158,162 ****
   * Will not return until all the data has been read.
   */
! long ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
  {
      long bytesRead;
--- 158,162 ----
   * Will not return until all the data has been read.
   */
! long PD_ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames )
  {
      long bytesRead;
***************
*** 165,169 ****
      while( numBytes > 0)
      {
!         bytesRead = RingBuffer_Read( &aStream->inFIFO, p, numBytes );
          numBytes -= bytesRead;
          p += bytesRead;
--- 165,169 ----
      while( numBytes > 0)
      {
!         bytesRead = PD_RingBuffer_Read( &aStream->inFIFO, p, numBytes );
          numBytes -= bytesRead;
          p += bytesRead;
***************
*** 177,183 ****
   * having to wait.
   */
! long GetAudioStreamWriteable( PABLIO_Stream *aStream )
  {
!     int bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
      return bytesEmpty / aStream->outbytesPerFrame;
  }
--- 177,183 ----
   * having to wait.
   */
! long PD_GetAudioStreamWriteable( PABLIO_Stream *aStream )
  {
!     int bytesEmpty = PD_RingBuffer_GetWriteAvailable( &aStream->outFIFO );
      return bytesEmpty / aStream->outbytesPerFrame;
  }
***************
*** 187,193 ****
   * stream without having to wait.
   */
! long GetAudioStreamReadable( PABLIO_Stream *aStream )
  {
!     int bytesFull = RingBuffer_GetReadAvailable( &aStream->inFIFO );
      return bytesFull / aStream->inbytesPerFrame;
  }
--- 187,193 ----
   * stream without having to wait.
   */
! long PD_GetAudioStreamReadable( PABLIO_Stream *aStream )
  {
!     int bytesFull = PD_RingBuffer_GetReadAvailable( &aStream->inFIFO );
      return bytesFull / aStream->inbytesPerFrame;
  }
***************
*** 213,217 ****
   *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE
   */
! PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
                           PaSampleFormat format, int inchannels,
  			 int outchannels, int framesperbuf, int nbuffers,
--- 213,217 ----
   *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE
   */
! PaError PD_OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
                           PaSampleFormat format, int inchannels,
  			 int outchannels, int framesperbuf, int nbuffers,
***************
*** 325,330 ****
          if( err != paNoError ) goto error;
          /* Make Write FIFO appear full initially. */
!         numBytes = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
!         RingBuffer_AdvanceWriteIndex( &aStream->outFIFO, numBytes );
      }
  
--- 325,330 ----
          if( err != paNoError ) goto error;
          /* Make Write FIFO appear full initially. */
!         numBytes = PD_RingBuffer_GetWriteAvailable( &aStream->outFIFO );
!         PD_RingBuffer_AdvanceWriteIndex( &aStream->outFIFO, numBytes );
      }
  
***************
*** 365,369 ****
      {
          fprintf(stderr, "Pa_StartStream failed; closing audio stream...\n");
!         CloseAudioStream( aStream );
          goto error;
      }
--- 365,369 ----
      {
          fprintf(stderr, "Pa_StartStream failed; closing audio stream...\n");
!         PD_CloseAudioStream( aStream );
          goto error;
      }
***************
*** 378,382 ****
  
  /************************************************************/
! PaError CloseAudioStream( PABLIO_Stream *aStream )
  {
      PaError err;
--- 378,382 ----
  
  /************************************************************/
! PaError PD_CloseAudioStream( PABLIO_Stream *aStream )
  {
      PaError err;
***************
*** 387,395 ****
      if( byteSize > 0 )
      {
!         bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
          while( bytesEmpty < byteSize )
          {
              NPa_Sleep( 10 ); /* MSP */
!             bytesEmpty = RingBuffer_GetWriteAvailable( &aStream->outFIFO );
          }
      }
--- 387,395 ----
      if( byteSize > 0 )
      {
!         bytesEmpty = PD_RingBuffer_GetWriteAvailable( &aStream->outFIFO );
          while( bytesEmpty < byteSize )
          {
              NPa_Sleep( 10 ); /* MSP */
!             bytesEmpty = PD_RingBuffer_GetWriteAvailable( &aStream->outFIFO );
          }
      }

Index: s_audio_pa.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_pa.c,v
retrieving revision 1.4.4.7.2.4
retrieving revision 1.4.4.7.2.5
diff -C2 -d -r1.4.4.7.2.4 -r1.4.4.7.2.5
*** s_audio_pa.c	30 Nov 2005 13:36:58 -0000	1.4.4.7.2.4
--- s_audio_pa.c	24 Jan 2006 01:29:53 -0000	1.4.4.7.2.5
***************
*** 176,180 ****
  		{
  			int nbuffers = sys_advance_samples / sys_dacblocksize;
! 			err = OpenAudioStream( &pablio_stream, rate, paFloat32,
  								   inchans, outchans, sys_dacblocksize, 
  								   nbuffers, pa_indev, pa_outdev);
--- 176,180 ----
  		{
  			int nbuffers = sys_advance_samples / sys_dacblocksize;
! 			err = PD_OpenAudioStream( &pablio_stream, rate, paFloat32,
  								   inchans, outchans, sys_dacblocksize, 
  								   nbuffers, pa_indev, pa_outdev);
***************
*** 279,283 ****
  		if (pablio_stream)
  		{
! 			CloseAudioStream(pablio_stream);
  			pablio_stream = NULL;
  		}
--- 279,283 ----
  		if (pablio_stream)
  		{
! 			PD_CloseAudioStream(pablio_stream);
  			pablio_stream = NULL;
  		}
***************
*** 341,351 ****
  
      timebefore = sys_getrealtime();
!     if ((pa_inchans && GetAudioStreamReadable(pablio_stream) < sys_dacblocksize) ||
!         (pa_outchans && GetAudioStreamWriteable(pablio_stream) < sys_dacblocksize))
      {
          if (pa_inchans && pa_outchans)
          {
              int synced = 0;
!             while (GetAudioStreamWriteable(pablio_stream) > 2*sys_dacblocksize)
              {
                  for (j = 0; j < pa_outchans; j++)
--- 341,351 ----
  
      timebefore = sys_getrealtime();
!     if ((pa_inchans && PD_GetAudioStreamReadable(pablio_stream) < sys_dacblocksize) ||
!         (pa_outchans && PD_GetAudioStreamWriteable(pablio_stream) < sys_dacblocksize))
      {
          if (pa_inchans && pa_outchans)
          {
              int synced = 0;
!             while (PD_GetAudioStreamWriteable(pablio_stream) > 2*sys_dacblocksize)
              {
                  for (j = 0; j < pa_outchans; j++)
***************
*** 356,365 ****
                  }
                  synced = 1;
!                 WriteAudioStream(pablio_stream, samples, sys_dacblocksize);
              }
!             while (GetAudioStreamReadable(pablio_stream) > 2*sys_dacblocksize)
              {
                  synced = 1;
!                 ReadAudioStream(pablio_stream, samples, sys_dacblocksize);
              }
  /*             if (synced) */
--- 356,365 ----
                  }
                  synced = 1;
!                 PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize);
              }
!             while (PD_GetAudioStreamReadable(pablio_stream) > 2*sys_dacblocksize)
              {
                  synced = 1;
!                 PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize);
              }
  /*             if (synced) */
***************
*** 370,374 ****
      if (pa_inchans)
      {
!         ReadAudioStream(pablio_stream, samples, sys_dacblocksize);
          for (j = 0, fp1 = sys_soundin; j < pa_inchans; j++, fp1 += sys_dacblocksize)
              for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++,
--- 370,374 ----
      if (pa_inchans)
      {
!         PD_ReadAudioStream(pablio_stream, samples, sys_dacblocksize);
          for (j = 0, fp1 = sys_soundin; j < pa_inchans; j++, fp1 += sys_dacblocksize)
              for (i = 0, fp2 = samples + j; i < sys_dacblocksize; i++,
***************
*** 388,392 ****
              fp1[i] = 0;
          }
!         WriteAudioStream(pablio_stream, samples, sys_dacblocksize);
      }
  
--- 388,392 ----
              fp1[i] = 0;
          }
!         PD_WriteAudioStream(pablio_stream, samples, sys_dacblocksize);
      }
  

Index: s_audio_paring.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_paring.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.1.2.1
diff -C2 -d -r1.1.4.1 -r1.1.4.1.2.1
*** s_audio_paring.c	5 Nov 2004 14:27:47 -0000	1.1.4.1
--- s_audio_paring.c	24 Jan 2006 01:29:54 -0000	1.1.4.1.2.1
***************
*** 48,61 ****
   * Initialize FIFO.
   */
! long RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr )
  {
      rbuf->bufferSize = numBytes;
      rbuf->buffer = (char *)dataPtr;
!     RingBuffer_Flush( rbuf );
      return 0;
  }
  /***************************************************************************
  ** Return number of bytes available for reading. */
! long RingBuffer_GetReadAvailable( RingBuffer *rbuf )
  {
      long ret = rbuf->writeIndex - rbuf->readIndex;
--- 48,61 ----
   * Initialize FIFO.
   */
! long PD_RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr )
  {
      rbuf->bufferSize = numBytes;
      rbuf->buffer = (char *)dataPtr;
!     PD_RingBuffer_Flush( rbuf );
      return 0;
  }
  /***************************************************************************
  ** Return number of bytes available for reading. */
! long PD_RingBuffer_GetReadAvailable( RingBuffer *rbuf )
  {
      long ret = rbuf->writeIndex - rbuf->readIndex;
***************
*** 64,80 ****
      if (ret < 0 || ret > rbuf->bufferSize)
          fprintf(stderr,
!             "consistency check failed: RingBuffer_GetReadAvailable\n");
      return ( ret );
  }
  /***************************************************************************
  ** Return number of bytes available for writing. */
! long RingBuffer_GetWriteAvailable( RingBuffer *rbuf )
  {
!     return ( rbuf->bufferSize - RingBuffer_GetReadAvailable(rbuf));
  }
  
  /***************************************************************************
  ** Clear buffer. Should only be called when buffer is NOT being read. */
! void RingBuffer_Flush( RingBuffer *rbuf )
  {
      rbuf->writeIndex = rbuf->readIndex = 0;
--- 64,80 ----
      if (ret < 0 || ret > rbuf->bufferSize)
          fprintf(stderr,
!             "consistency check failed: PD_RingBuffer_GetReadAvailable\n");
      return ( ret );
  }
  /***************************************************************************
  ** Return number of bytes available for writing. */
! long PD_RingBuffer_GetWriteAvailable( RingBuffer *rbuf )
  {
!     return ( rbuf->bufferSize - PD_RingBuffer_GetReadAvailable(rbuf));
  }
  
  /***************************************************************************
  ** Clear buffer. Should only be called when buffer is NOT being read. */
! void PD_RingBuffer_Flush( RingBuffer *rbuf )
  {
      rbuf->writeIndex = rbuf->readIndex = 0;
***************
*** 87,96 ****
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes,
                                   void **dataPtr1, long *sizePtr1,
                                   void **dataPtr2, long *sizePtr2 )
  {
      long   index;
!     long   available = RingBuffer_GetWriteAvailable( rbuf );
      if( numBytes > available ) numBytes = available;
      /* Check to see if write is not contiguous. */
--- 87,96 ----
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long PD_RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes,
                                   void **dataPtr1, long *sizePtr1,
                                   void **dataPtr2, long *sizePtr2 )
  {
      long   index;
!     long   available = PD_RingBuffer_GetWriteAvailable( rbuf );
      if( numBytes > available ) numBytes = available;
      /* Check to see if write is not contiguous. */
***************
*** 120,124 ****
  /***************************************************************************
  */
! long RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes )
  {
      long ret = (rbuf->writeIndex + numBytes);
--- 120,124 ----
  /***************************************************************************
  */
! long PD_RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes )
  {
      long ret = (rbuf->writeIndex + numBytes);
***************
*** 134,143 ****
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes,
                                  void **dataPtr1, long *sizePtr1,
                                  void **dataPtr2, long *sizePtr2 )
  {
      long   index;
!     long   available = RingBuffer_GetReadAvailable( rbuf );
      if( numBytes > available ) numBytes = available;
      /* Check to see if read is not contiguous. */
--- 134,143 ----
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long PD_RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes,
                                  void **dataPtr1, long *sizePtr1,
                                  void **dataPtr2, long *sizePtr2 )
  {
      long   index;
!     long   available = PD_RingBuffer_GetReadAvailable( rbuf );
      if( numBytes > available ) numBytes = available;
      /* Check to see if read is not contiguous. */
***************
*** 166,170 ****
  /***************************************************************************
  */
! long RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes )
  {
      long ret = (rbuf->readIndex + numBytes);
--- 166,170 ----
  /***************************************************************************
  */
! long PD_RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes )
  {
      long ret = (rbuf->readIndex + numBytes);
***************
*** 176,184 ****
  /***************************************************************************
  ** Return bytes written. */
! long RingBuffer_Write( RingBuffer *rbuf, const void *data, long numBytes )
  {
      long size1, size2, numWritten;
      void *data1, *data2;
!     numWritten = RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
      if( size2 > 0 )
      {
--- 176,184 ----
  /***************************************************************************
  ** Return bytes written. */
! long PD_RingBuffer_Write( RingBuffer *rbuf, const void *data, long numBytes )
  {
      long size1, size2, numWritten;
      void *data1, *data2;
!     numWritten = PD_RingBuffer_GetWriteRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
      if( size2 > 0 )
      {
***************
*** 192,196 ****
          memcpy( data1, data, size1 );
      }
!     RingBuffer_AdvanceWriteIndex( rbuf, numWritten );
      return numWritten;
  }
--- 192,196 ----
          memcpy( data1, data, size1 );
      }
!     PD_RingBuffer_AdvanceWriteIndex( rbuf, numWritten );
      return numWritten;
  }
***************
*** 198,206 ****
  /***************************************************************************
  ** Return bytes read. */
! long RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes )
  {
      long size1, size2, numRead;
      void *data1, *data2;
!     numRead = RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
      if( size2 > 0 )
      {
--- 198,206 ----
  /***************************************************************************
  ** Return bytes read. */
! long PD_RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes )
  {
      long size1, size2, numRead;
      void *data1, *data2;
!     numRead = PD_RingBuffer_GetReadRegions( rbuf, numBytes, &data1, &size1, &data2, &size2 );
      if( size2 > 0 )
      {
***************
*** 213,217 ****
          memcpy( data, data1, size1 );
      }
!     RingBuffer_AdvanceReadIndex( rbuf, numRead );
      return numRead;
  }
--- 213,217 ----
          memcpy( data, data1, size1 );
      }
!     PD_RingBuffer_AdvanceReadIndex( rbuf, numRead );
      return numRead;
  }

Index: s_audio_paring.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_paring.h,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -C2 -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
*** s_audio_paring.h	30 Nov 2005 19:12:52 -0000	1.1.4.1.2.2
--- s_audio_paring.h	24 Jan 2006 01:29:54 -0000	1.1.4.1.2.3
***************
*** 1,4 ****
! #ifndef _RINGBUFFER_H
! #define _RINGBUFFER_H
  #ifdef __cplusplus
  extern "C"
--- 1,4 ----
! #ifndef _PD_RINGBUFFER_H
! #define _PD_RINGBUFFER_H
  #ifdef __cplusplus
  extern "C"
***************
*** 44,48 ****
  #include <stdlib.h>
  #include <math.h>
- #include "ringbuffer.h"
  #include <string.h>
  
--- 44,47 ----
***************
*** 62,78 ****
   * numBytes must be power of 2, returns -1 if not.
   */
! long RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr );
  
  /* Clear buffer. Should only be called when buffer is NOT being read. */
! void RingBuffer_Flush( RingBuffer *rbuf );
  
  /* Return number of bytes available for writing. */
! long RingBuffer_GetWriteAvailable( RingBuffer *rbuf );
  /* Return number of bytes available for read. */
! long RingBuffer_GetReadAvailable( RingBuffer *rbuf );
  /* Return bytes written. */
! long RingBuffer_Write( RingBuffer *rbuf, const void *data, long numBytes );
  /* Return bytes read. */
! long RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes );
  
  /* Get address of region(s) to which we can write data.
--- 61,77 ----
   * numBytes must be power of 2, returns -1 if not.
   */
! long PD_RingBuffer_Init( RingBuffer *rbuf, long numBytes, void *dataPtr );
  
  /* Clear buffer. Should only be called when buffer is NOT being read. */
! void PD_RingBuffer_Flush( RingBuffer *rbuf );
  
  /* Return number of bytes available for writing. */
! long PD_RingBuffer_GetWriteAvailable( RingBuffer *rbuf );
  /* Return number of bytes available for read. */
! long PD_RingBuffer_GetReadAvailable( RingBuffer *rbuf );
  /* Return bytes written. */
! long PD_RingBuffer_Write( RingBuffer *rbuf, const void *data, long numBytes );
  /* Return bytes read. */
! long PD_RingBuffer_Read( RingBuffer *rbuf, void *data, long numBytes );
  
  /* Get address of region(s) to which we can write data.
***************
*** 81,88 ****
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes,
                                   void **dataPtr1, long *sizePtr1,
                                   void **dataPtr2, long *sizePtr2 );
! long RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes );
  
  /* Get address of region(s) from which we can read data.
--- 80,87 ----
  ** Returns room available to be written or numBytes, whichever is smaller.
  */
! long PD_RingBuffer_GetWriteRegions( RingBuffer *rbuf, long numBytes,
                                   void **dataPtr1, long *sizePtr1,
                                   void **dataPtr2, long *sizePtr2 );
! long PD_RingBuffer_AdvanceWriteIndex( RingBuffer *rbuf, long numBytes );
  
  /* Get address of region(s) from which we can read data.
***************
*** 91,102 ****
  ** Returns room available to be read or numBytes, whichever is smaller.
  */
! long RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes,
                                  void **dataPtr1, long *sizePtr1,
                                  void **dataPtr2, long *sizePtr2 );
  
! long RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes );
  
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
! #endif /* _RINGBUFFER_H */
--- 90,101 ----
  ** Returns room available to be read or numBytes, whichever is smaller.
  */
! long PD_RingBuffer_GetReadRegions( RingBuffer *rbuf, long numBytes,
                                  void **dataPtr1, long *sizePtr1,
                                  void **dataPtr2, long *sizePtr2 );
  
! long PD_RingBuffer_AdvanceReadIndex( RingBuffer *rbuf, long numBytes );
  
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
! #endif /* _PD_RINGBUFFER_H */

Index: s_audio_pablio.h
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_audio_pablio.h,v
retrieving revision 1.1.4.1.2.2
retrieving revision 1.1.4.1.2.3
diff -C2 -d -r1.1.4.1.2.2 -r1.1.4.1.2.3
*** s_audio_pablio.h	30 Nov 2005 19:12:52 -0000	1.1.4.1.2.2
--- s_audio_pablio.h	24 Jan 2006 01:29:54 -0000	1.1.4.1.2.3
***************
*** 1,4 ****
! #ifndef _PABLIO_H
! #define _PABLIO_H
  
  #ifdef __cplusplus
--- 1,4 ----
! #ifndef _PD_PABLIO_H
! #define _PD_PABLIO_H
  
  #ifdef __cplusplus
***************
*** 46,51 ****
  #include <stdlib.h>
  #include <math.h>
! #include "portaudio.h"
! #include "ringbuffer.h"
  #include <string.h>
  
--- 46,51 ----
  #include <stdlib.h>
  #include <math.h>
! #include <portaudio.h>
! #include "s_audio_paring.h"
  #include <string.h>
  
***************
*** 73,77 ****
   * Will not return until all the data has been written.
   */
! long WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
  
  /************************************************************
--- 73,77 ----
   * Will not return until all the data has been written.
   */
! long PD_WriteAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
  
  /************************************************************
***************
*** 79,83 ****
   * Will not return until all the data has been read.
   */
! long ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
  
  /************************************************************
--- 79,83 ----
   * Will not return until all the data has been read.
   */
! long PD_ReadAudioStream( PABLIO_Stream *aStream, void *data, long numFrames );
  
  /************************************************************
***************
*** 85,89 ****
   * having to wait.
   */
! long GetAudioStreamWriteable( PABLIO_Stream *aStream );
  
  /************************************************************
--- 85,89 ----
   * having to wait.
   */
! long PD_GetAudioStreamWriteable( PABLIO_Stream *aStream );
  
  /************************************************************
***************
*** 91,95 ****
   * stream without having to wait.
   */
! long GetAudioStreamReadable( PABLIO_Stream *aStream );
  
  /************************************************************
--- 91,95 ----
   * stream without having to wait.
   */
! long PD_GetAudioStreamReadable( PABLIO_Stream *aStream );
  
  /************************************************************
***************
*** 100,112 ****
   *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
   */
! PaError OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
                           PaSampleFormat format, int inchannels,
                           int outchannels, int framesperbuf, int nbuffers,
                           int indeviceno, int outdeviceno); /* MSP */
  
! PaError CloseAudioStream( PABLIO_Stream *aStream );
  
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
! #endif /* _PABLIO_H */
--- 100,112 ----
   *    PABLIO_READ, PABLIO_WRITE, or PABLIO_READ_WRITE,
   */
! PaError PD_OpenAudioStream( PABLIO_Stream **rwblPtr, double sampleRate,
                           PaSampleFormat format, int inchannels,
                           int outchannels, int framesperbuf, int nbuffers,
                           int indeviceno, int outdeviceno); /* MSP */
  
! PaError PD_CloseAudioStream( PABLIO_Stream *aStream );
  
  #ifdef __cplusplus
  }
  #endif /* __cplusplus */
! #endif /* _PD_PABLIO_H */





More information about the Pd-cvs mailing list