Menu
▾
▴
[Iaxclient-cvs] SF.net SVN: iaxclient: [1237] branches/team/elbunce/iaxclient/ portaudio-deviceschanged.patch
|
From: <do...@us...> - 2007-10-30 03:10:17
|
Revision: 1237
http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1237&view=rev
Author: dohpaz
Date: 2007-10-29 20:10:21 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
Update patch to work against portaudio v19-devel r1296.
Modified Paths:
--------------
branches/team/elbunce/iaxclient/portaudio-deviceschanged.patch
Modified: branches/team/elbunce/iaxclient/portaudio-deviceschanged.patch
===================================================================
--- branches/team/elbunce/iaxclient/portaudio-deviceschanged.patch 2007-10-29 21:07:35 UTC (rev 1236)
+++ branches/team/elbunce/iaxclient/portaudio-deviceschanged.patch 2007-10-30 03:10:21 UTC (rev 1237)
@@ -316,7 +316,7 @@
Index: Makefile.in
===================================================================
---- Makefile.in (revision 1292)
+--- Makefile.in (revision 1296)
+++ Makefile.in (working copy)
@@ -59,6 +59,7 @@
bin/paqa_devs \
@@ -328,7 +328,7 @@
bin/patest_clip \
Index: include/portaudio.h
===================================================================
---- include/portaudio.h (revision 1292)
+--- include/portaudio.h (revision 1296)
+++ include/portaudio.h (working copy)
@@ -356,10 +356,97 @@
*/
@@ -441,7 +441,7 @@
*/
Index: src/hostapi/alsa/pa_linux_alsa.c
===================================================================
---- src/hostapi/alsa/pa_linux_alsa.c (revision 1292)
+--- src/hostapi/alsa/pa_linux_alsa.c (revision 1296)
+++ src/hostapi/alsa/pa_linux_alsa.c (working copy)
@@ -254,6 +254,7 @@
(*hostApi)->info.name = "ALSA";
@@ -453,7 +453,7 @@
Index: src/hostapi/oss/pa_unix_oss.c
===================================================================
---- src/hostapi/oss/pa_unix_oss.c (revision 1292)
+--- src/hostapi/oss/pa_unix_oss.c (revision 1296)
+++ src/hostapi/oss/pa_unix_oss.c (working copy)
@@ -250,6 +250,7 @@
(*hostApi)->info.type = paOSS;
@@ -465,7 +465,7 @@
Index: src/hostapi/wasapi/pa_win_wasapi.cpp
===================================================================
---- src/hostapi/wasapi/pa_win_wasapi.cpp (revision 1292)
+--- src/hostapi/wasapi/pa_win_wasapi.cpp (revision 1296)
+++ src/hostapi/wasapi/pa_win_wasapi.cpp (working copy)
@@ -635,6 +635,7 @@
spEndpoints->Release();
@@ -484,7 +484,7 @@
+#endif
Index: src/hostapi/wdmks/pa_win_wdmks.c
===================================================================
---- src/hostapi/wdmks/pa_win_wdmks.c (revision 1292)
+--- src/hostapi/wdmks/pa_win_wdmks.c (revision 1296)
+++ src/hostapi/wdmks/pa_win_wdmks.c (working copy)
@@ -1876,6 +1876,7 @@
(*hostApi)->info.deviceCount = deviceCount;
@@ -503,7 +503,7 @@
+}
Index: src/hostapi/wmme/pa_win_wmme.c
===================================================================
---- src/hostapi/wmme/pa_win_wmme.c (revision 1292)
+--- src/hostapi/wmme/pa_win_wmme.c (revision 1296)
+++ src/hostapi/wmme/pa_win_wmme.c (working copy)
@@ -1040,6 +1040,7 @@
InitializeDefaultDeviceIdsFromEnv( winMmeHostApi );
@@ -515,7 +515,7 @@
Index: src/hostapi/jack/pa_jack.c
===================================================================
---- src/hostapi/jack/pa_jack.c (revision 1292)
+--- src/hostapi/jack/pa_jack.c (revision 1296)
+++ src/hostapi/jack/pa_jack.c (working copy)
@@ -746,6 +746,7 @@
/* Register functions */
@@ -527,7 +527,7 @@
Index: src/hostapi/coreaudio/pa_mac_core.c
===================================================================
---- src/hostapi/coreaudio/pa_mac_core.c (revision 1292)
+--- src/hostapi/coreaudio/pa_mac_core.c (revision 1296)
+++ src/hostapi/coreaudio/pa_mac_core.c (working copy)
@@ -70,6 +70,7 @@
#include "pa_mac_core.h"
@@ -545,8 +545,8 @@
static PaError IsFormatSupported( struct PaUtilHostApiRepresentation *hostApi,
const PaStreamParameters *inputParameters,
const PaStreamParameters *outputParameters,
-@@ -301,47 +303,13 @@
- return 0;
+@@ -324,47 +326,13 @@
+ sfc( stream->streamRepresentation.userData );
}
-
@@ -598,7 +598,7 @@
/* determine the default device. */
/* I am not sure how these calls to AudioHardwareGetProperty()
-@@ -362,8 +330,19 @@
+@@ -385,8 +353,19 @@
auhalHostApi->defaultIn = auhalHostApi->devIds[i];
break;
}
@@ -619,7 +619,7 @@
if( 0 != AudioHardwareGetProperty(kAudioHardwarePropertyDefaultOutputDevice,
&size,
&auhalHostApi->defaultOut) ) {
-@@ -381,13 +360,119 @@
+@@ -404,13 +383,119 @@
}
}
}
@@ -741,7 +741,7 @@
static PaError GetChannelInfo( PaMacAUHAL *auhalHostApi,
PaDeviceInfo *deviceInfo,
AudioDeviceID macCoreDeviceId,
-@@ -603,6 +688,7 @@
+@@ -626,6 +711,7 @@
}
(*hostApi)->Terminate = Terminate;
@@ -749,7 +749,7 @@
(*hostApi)->OpenStream = OpenStream;
(*hostApi)->IsFormatSupported = IsFormatSupported;
-@@ -624,6 +710,14 @@
+@@ -647,6 +733,14 @@
GetStreamReadAvailable,
GetStreamWriteAvailable );
@@ -764,7 +764,7 @@
return result;
error:
-@@ -653,6 +747,14 @@
+@@ -676,6 +770,14 @@
TODO: Double check that everything is handled by alloc group
*/
@@ -779,7 +779,7 @@
if( auhalHostApi->allocations )
{
PaUtil_FreeAllAllocations( auhalHostApi->allocations );
-@@ -662,7 +764,89 @@
+@@ -685,7 +787,89 @@
PaUtil_FreeMemory( auhalHostApi );
}
@@ -871,7 +871,7 @@
const PaStreamParameters *outputParameters,
Index: src/hostapi/asio/pa_asio.cpp
===================================================================
---- src/hostapi/asio/pa_asio.cpp (revision 1292)
+--- src/hostapi/asio/pa_asio.cpp (revision 1296)
+++ src/hostapi/asio/pa_asio.cpp (working copy)
@@ -1286,6 +1286,7 @@
@@ -883,7 +883,7 @@
Index: src/hostapi/dsound/pa_win_ds.c
===================================================================
---- src/hostapi/dsound/pa_win_ds.c (revision 1292)
+--- src/hostapi/dsound/pa_win_ds.c (revision 1296)
+++ src/hostapi/dsound/pa_win_ds.c (working copy)
@@ -1134,6 +1134,7 @@
@@ -895,7 +895,7 @@
Index: src/hostapi/asihpi/pa_linux_asihpi.c
===================================================================
---- src/hostapi/asihpi/pa_linux_asihpi.c (revision 1292)
+--- src/hostapi/asihpi/pa_linux_asihpi.c (revision 1296)
+++ src/hostapi/asihpi/pa_linux_asihpi.c (working copy)
@@ -780,6 +780,7 @@
PA_ENSURE_( PaAsiHpi_BuildDeviceList( hpiHostApi ) );
@@ -907,7 +907,7 @@
Index: src/common/pa_util.h
===================================================================
---- src/common/pa_util.h (revision 1292)
+--- src/common/pa_util.h (revision 1296)
+++ src/common/pa_util.h (working copy)
@@ -151,8 +151,23 @@
@@ -935,7 +935,7 @@
#endif /* __cplusplus */
Index: src/common/pa_skeleton.c
===================================================================
---- src/common/pa_skeleton.c (revision 1292)
+--- src/common/pa_skeleton.c (revision 1296)
+++ src/common/pa_skeleton.c (working copy)
@@ -74,6 +74,7 @@
@@ -1047,7 +1047,7 @@
const PaStreamParameters *outputParameters,
Index: src/common/pa_front.c
===================================================================
---- src/common/pa_front.c (revision 1292)
+--- src/common/pa_front.c (revision 1296)
+++ src/common/pa_front.c (working copy)
@@ -89,9 +89,6 @@
#define PA_VERSION_ 1899
@@ -1245,15 +1245,23 @@
PaDeviceIndex result;
Index: src/common/pa_hostapi.h
===================================================================
---- src/common/pa_hostapi.h (revision 1292)
+--- src/common/pa_hostapi.h (revision 1296)
+++ src/common/pa_hostapi.h (working copy)
-@@ -109,6 +109,13 @@
+@@ -109,6 +109,21 @@
void (*Terminate)( struct PaUtilHostApiRepresentation *hostApi );
/**
-+ (*Terminate)() is guaranteed to be called with a valid <hostApi>
++ (*RescanDevices)() is guaranteed to be called with a valid <hostApi>
+ parameter, which was previously returned from the same implementation's
+ initializer.
++
++ If set to 0 the portaudio implementation will skip rescanning this host
++ api.
++
++ The host api implementation is allowed to modify the
++ PaHostApiInfo::deviceCount, and the deviceInfos to reflect the new set
++ of devices. If an error occurs during processing, the host api
++ implementation MUST ensure that they are left in a consistant state.
+ */
+ PaError (*RescanDevices)( struct PaUtilHostApiRepresentation *hostApi );
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
