aboutsummaryrefslogtreecommitdiff
path: root/pd/portaudio/pa_common/portaudio.h
diff options
context:
space:
mode:
Diffstat (limited to 'pd/portaudio/pa_common/portaudio.h')
-rw-r--r--pd/portaudio/pa_common/portaudio.h23
1 files changed, 9 insertions, 14 deletions
diff --git a/pd/portaudio/pa_common/portaudio.h b/pd/portaudio/pa_common/portaudio.h
index e01c7aa8..341d92c9 100644
--- a/pd/portaudio/pa_common/portaudio.h
+++ b/pd/portaudio/pa_common/portaudio.h
@@ -1,7 +1,8 @@
+
#ifndef PORTAUDIO_H
#define PORTAUDIO_H
/*
- * $Id: portaudio.h,v 1.5.2.46 2004/02/14 10:19:01 rossbencina Exp $
+ * $Id: portaudio.h,v 1.5.2.50 2004/12/13 11:50:40 rossbencina Exp $
* PortAudio Portable Real-Time Audio Library
* PortAudio API Header File
* Latest version available at: http://www.portaudio.com/
@@ -222,7 +223,9 @@ typedef enum PaHostApiTypeId
paOSS=7,
paALSA=8,
paAL=9,
- paBeOS=10
+ paBeOS=10,
+ paWDMKS=11,
+ paJACK=12
} PaHostApiTypeId;
@@ -360,7 +363,7 @@ PaDeviceIndex Pa_GetDeviceCount( void );
/** Retrieve the index of the default input device. The result can be
used in the inputDevice parameter to Pa_OpenStream().
- @return The default input device index for the defualt host API, or paNoDevice
+ @return The default input device index for the default host API, or paNoDevice
if no default input device is available or an error was encountered.
*/
PaDeviceIndex Pa_GetDefaultInputDevice( void );
@@ -486,11 +489,6 @@ typedef struct PaStreamParameters
/** The sample format of the buffer provided to the stream callback,
a_ReadStream() or Pa_WriteStream(). It may be any of the formats described
by the PaSampleFormat enumeration.
- FIXME: wrt below, what are we guaranteeing these days, if anything?
- PortAudio guarantees support for
- the device's native formats (nativeSampleFormats in the device info record)
- and additionally 16 and 32 bit integer and 32 bit floating point formats.
- Support for other formats is implementation defined.
*/
PaSampleFormat sampleFormat;
@@ -717,7 +715,7 @@ typedef enum PaStreamCallbackResult
@return
The stream callback should return one of the values in the
- PaStreamCallbackResult enumeration. To ensure that the callback is continues
+ PaStreamCallbackResult enumeration. To ensure that the callback continues
to be called, it should return paContinue (0). Either paComplete or paAbort
can be returned to finish stream processing, after either of these values is
returned the callback will not be called again. If paAbort is returned the
@@ -824,11 +822,8 @@ PaError Pa_OpenStream( PaStream** stream,
@param sampleFormat The sample format of both the input and output buffers
provided to the callback or passed to and from Pa_ReadStream and Pa_WriteStream.
- sampleFormat may be any of the formats described by the PaSampleFormat enumeration
- (see above).
- FIXME: the following may need to be rewritten - PortAudio guarantees support for
- the device's native formats (nativeSampleFormats in the device info record)
- and additionally 16 and 32 bit integer and 32 bit float
+ sampleFormat may be any of the formats described by the PaSampleFormat
+ enumeration.
@param sampleRate Same as Pa_OpenStream parameter of the same name.
@param framesPerBuffer Same as Pa_OpenStream parameter of the same name.