Update of /cvsroot/audacity/lib-src/portaudio-v19/include
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29383/lib-src/portaudio-v19/include
Modified Files:
pa_asio.h pa_linux_alsa.h pa_win_waveformat.h pa_win_wmme.h
Log Message:
Update portaudio-v19 to current portaudio SVN version, r1414
Index: pa_win_wmme.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/include/pa_win_wmme.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pa_win_wmme.h 31 Dec 2008 15:38:31 -0000 1.8
+++ pa_win_wmme.h 25 May 2009 21:40:16 -0000 1.9
@@ -53,6 +53,10 @@
#endif /* __cplusplus */
+/* The following are flags which can be set in
+ PaWinMmeStreamInfo's flags field.
+*/
+
#define paWinMmeUseLowLevelLatencyParameters (0x01)
#define paWinMmeUseMultipleDevices (0x02) /* use mme
specific multiple device feature */
#define paWinMmeUseChannelMask (0x04)
@@ -64,6 +68,11 @@
*/
#define paWinMmeDontThrottleOverloadedProcessingThread (0x08)
+/* Flags for non-PCM spdif passthrough.
+*/
+#define paWinMmeWaveFormatDolbyAc3Spdif (0x10)
+#define paWinMmeWaveFormatWmaSpdif (0x20)
+
typedef struct PaWinMmeDeviceAndChannelCount{
PaDeviceIndex device;
Index: pa_win_waveformat.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/include/pa_win_waveformat.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pa_win_waveformat.h 1 Jan 2009 22:31:28 -0000 1.9
+++ pa_win_waveformat.h 25 May 2009 21:40:16 -0000 1.10
@@ -158,15 +158,32 @@
#define PAWIN_INDEXOF_SUBFORMAT
(PAWIN_SIZEOF_WAVEFORMATEX+6)
/*
+ Valid values to pass for the waveFormatTag PaWin_InitializeWaveFormatEx and
+ PaWin_InitializeWaveFormatExtensible functions below. These must match
+ the standard Windows WAVE_FORMAT_* values.
+*/
+#define PAWIN_WAVE_FORMAT_PCM (1)
+#define PAWIN_WAVE_FORMAT_IEEE_FLOAT (3)
+#define PAWIN_WAVE_FORMAT_DOLBY_AC3_SPDIF (0x0092)
+#define PAWIN_WAVE_FORMAT_WMA_SPDIF (0x0164)
+
+
+/*
+ returns PAWIN_WAVE_FORMAT_PCM or PAWIN_WAVE_FORMAT_IEEE_FLOAT
+ depending on the sampleFormat parameter.
+*/
+int PaWin_SampleFormatToLinearWaveFormatTag( PaSampleFormat sampleFormat );
+
+/*
Use the following two functions to initialize the waveformat structure.
*/
void PaWin_InitializeWaveFormatEx( PaWinWaveFormat *waveFormat,
- int numChannels, PaSampleFormat sampleFormat, double sampleRate
);
+ int numChannels, PaSampleFormat sampleFormat, int
waveFormatTag, double sampleRate );
void PaWin_InitializeWaveFormatExtensible( PaWinWaveFormat *waveFormat,
- int numChannels, PaSampleFormat sampleFormat, double sampleRate,
+ int numChannels, PaSampleFormat sampleFormat, int
waveFormatTag, double sampleRate,
PaWinWaveFormatChannelMask channelMask );
@@ -178,4 +195,4 @@
}
#endif /* __cplusplus */
-#endif /* PA_WIN_WAVEFORMAT_H */
\ No newline at end of file
+#endif /* PA_WIN_WAVEFORMAT_H */
Index: pa_asio.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/include/pa_asio.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- pa_asio.h 31 Dec 2008 15:38:31 -0000 1.8
+++ pa_asio.h 25 May 2009 21:40:15 -0000 1.9
@@ -100,6 +100,19 @@
const char** channelName );
+/** Set the sample rate of an open paASIO stream.
+
+ @param stream The stream to operate on.
+ @param sampleRate The new sample rate.
+
+ Note that this function may fail if the stream is alredy running and the
+ ASIO driver does not support switching the sample rate of a running stream.
+
+ Returns paIncompatibleStreamHostApi if stream is not a paASIO stream.
+*/
+PaError PaAsio_SetStreamSampleRate( PaStream* stream, double sampleRate );
+
+
#define paAsioUseChannelSelectors (0x01)
typedef struct PaAsioStreamInfo{
Index: pa_linux_alsa.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/include/pa_linux_alsa.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- pa_linux_alsa.h 31 Dec 2008 15:38:31 -0000 1.9
+++ pa_linux_alsa.h 25 May 2009 21:40:16 -0000 1.10
@@ -87,6 +87,11 @@
*/
PaError PaAlsa_SetNumPeriods( int numPeriods );
+/** Set the maximum number of times to retry opening busy device (sleeping for
a
+ * short interval inbetween).
+ */
+PaError PaAlsa_SetRetriesBusy( int retries );
+
#ifdef __cplusplus
}
#endif
------------------------------------------------------------------------------
Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT
is a gathering of tech-side developers & brand creativity professionals. Meet
the minds behind Google Creative Lab, Visual Complexity, Processing, &
iPhoneDevCamp asthey present alongside digital heavyweights like Barbarian
Group, R/GA, & Big Spaceship. http://www.creativitycat.com
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
