Update of /cvsroot/audacity/lib-src/portaudio-v19/src/os/unix
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22516/src/os/unix
Modified Files:
pa_unix_hostapis.c pa_unix_util.c pa_unix_util.h
Log Message:
Bringing PortAudio up to their latest SVN sources.
Index: pa_unix_util.h
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/src/os/unix/pa_unix_util.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pa_unix_util.h 10 Jun 2006 21:30:56 -0000 1.1
+++ pa_unix_util.h 23 Sep 2006 18:42:51 -0000 1.2
@@ -1,3 +1,46 @@
+/*
+ * $Id$
+ * Portable Audio I/O Library
+ * UNIX platform-specific support functions
+ *
+ * Based on the Open Source API proposed by Ross Bencina
+ * Copyright (c) 1999-2000 Ross Bencina
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
+
#ifndef PA_UNIX_UTIL_H
#define PA_UNIX_UTIL_H
Index: pa_unix_util.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/src/os/unix/pa_unix_util.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pa_unix_util.c 20 Aug 2006 00:17:51 -0000 1.2
+++ pa_unix_util.c 23 Sep 2006 18:42:51 -0000 1.3
@@ -17,10 +17,6 @@
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version.
- *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -30,6 +26,20 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
#include <pthread.h>
#include <unistd.h>
@@ -354,16 +364,14 @@
if( th->watchdogRunning )
{
pthread_cancel( th->watchdogThread );
- PA_ENSURE_SYSTEM( pthread_join( th->watchdogThread, &pret ), 0 )
+ PA_ENSURE_SYSTEM( pthread_join( th->watchdogThread, &pret ), 0 );
- #ifdef PTHREAD_CANCELED
if( pret && pret != PTHREAD_CANCELED )
{
if( watchdogExitResult )
*watchdogExitResult = *(PaError *) pret;
free( pret );
}
- #endif
}
#endif
@@ -379,7 +387,6 @@
PA_DEBUG(( "%s: Joining thread %d\n", __FUNCTION__, self->thread ));
PA_ENSURE_SYSTEM( pthread_join( self->thread, &pret ), 0 );
- #ifdef PTHREAD_CANCELED
if( pret && PTHREAD_CANCELED != pret )
{
if( exitResult )
@@ -388,7 +395,6 @@
}
free( pret );
}
- #endif
error:
PA_ASSERT_CALL( PaUnixMutex_Terminate( &self->mtx ), paNoError );
Index: pa_unix_hostapis.c
===================================================================
RCS file:
/cvsroot/audacity/lib-src/portaudio-v19/src/os/unix/pa_unix_hostapis.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pa_unix_hostapis.c 10 Jun 2006 21:30:56 -0000 1.1
+++ pa_unix_hostapis.c 23 Sep 2006 18:42:51 -0000 1.2
@@ -16,10 +16,6 @@
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
- * Any person wishing to distribute modifications to the Software is
- * requested to send the modifications to the original developer so that
- * they can be incorporated into the canonical version.
- *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -29,6 +25,20 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * Any person wishing to distribute modifications to the Software is
+ * requested to send the modifications to the original developer so that
+ * they can be incorporated into the canonical version. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/** @file
+ @ingroup unix_src
+*/
#include "pa_hostapi.h"
@@ -37,6 +47,8 @@
PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi,
PaHostApiIndex index );
/* Added for IRIX, Pieter, oct 2, 2003: */
PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi,
PaHostApiIndex index );
+/* Linux AudioScience HPI */
+PaError PaAsiHpi_Initialize( PaUtilHostApiRepresentation **hostApi,
PaHostApiIndex index );
PaUtilHostApiInitializer *paHostApiInitializers[] =
@@ -56,9 +68,11 @@
#ifdef PA_USE_SGI
PaSGI_Initialize,
#endif
+
+#ifdef PA_USE_ASIHPI
+ PaAsiHpi_Initialize,
+#endif
0 /* NULL terminated array */
};
int paDefaultHostApiIndex = 0;
-
-
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
