Update of /cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/asio
In directory
sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27584/portaudio-v19/src/hostapi/asio
Modified Files:
pa_asio.cpp
Log Message:
Update portaudio to 2007-jun-01 snapshot
Index: pa_asio.cpp
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/asio/pa_asio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pa_asio.cpp 23 Sep 2006 18:42:48 -0000 1.2
+++ pa_asio.cpp 3 Jun 2007 08:30:30 -0000 1.3
@@ -1018,6 +1018,10 @@
192000.0, 16000.0, 12000.0, 11025.0, 9600.0, 8000.0 };
+/* we look up IsDebuggerPresent at runtime incase it isn't present (on Win95
for example) */
+typedef BOOL (WINAPI *IsDebuggerPresentPtr)(VOID);
+IsDebuggerPresentPtr IsDebuggerPresent_ = 0;
+
PaError PaAsio_Initialize( PaUtilHostApiRepresentation **hostApi,
PaHostApiIndex hostApiIndex )
{
PaError result = paNoError;
@@ -1097,6 +1101,8 @@
goto error;
}
+ IsDebuggerPresent_ = GetProcAddress( LoadLibrary(
"Kernel32.dll" ), "IsDebuggerPresent" );
+
for( i=0; i < driverCount; ++i )
{
@@ -1113,13 +1119,26 @@
|| strcmp (names[i],"ASIO Multimedia Driver") == 0
|| strncmp(names[i],"Premiere",8) == 0
//"Premiere Elements Windows Sound 1.0"
|| strncmp(names[i],"Adobe",5) == 0
//"Adobe Default Windows Sound 1.5"
- || strncmp(names[i],"ReaRoute ASIO",13) == 0)
//Reaper www.reaper.fm <- fix your stuff man.
+ || strncmp(names[i],"ReaRoute ASIO",13) == 0
//Reaper www.reaper.fm <- fix your stuff man.
+ )
{
PA_DEBUG(("BLACKLISTED!!!\n"));
continue;
}
+ if( IsDebuggerPresent_ && IsDebuggerPresent_() )
+ {
+ /* ASIO Digidesign Driver uses PACE copy protection which
quits out
+ if a debugger is running. So we don't load it if a debugger
is running. */
+ if( strcmp(names[i], "ASIO Digidesign Driver") == 0 )
+ {
+ PA_DEBUG(("BLACKLISTED!!! ASIO Digidesign Driver would
quit the debugger\n"));
+ continue;
+ }
+ }
+
+
/* Attempt to load the asio driver... */
if( LoadAsioDriver( names[i], &paAsioDriverInfo,
asioHostApi->systemSpecific ) == paNoError )
{
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
