Changeset 1467

Timestamp:

03/04/10 06:02:06 (5 months ago)

Author:

dmitrykos

Message:

wasapi: fixed initialization stage of PaWasapi?_Initialize() which was returning error if WASAPI wasn't found (for example under Windows XP), this was causing PA's whole initialization to fail completely

File:

• portaudio/trunk/src/hostapi/wasapi/pa_win_wasapi.c (modified) (5 diffs)

portaudio/trunk/src/hostapi/wasapi/pa_win_wasapi.c

@@ -835 +835 @@
 PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )
 {
-    PaError result = paUnanticipatedHostError;
+    PaError result = paNoError;
     PaWasapiHostApiRepresentation *paWasapi;
     PaDeviceInfo *deviceInfoArray;
@@ -844 +844 @@
     if (!SetupAVRT())
         {
-        PRINT(("Windows WASAPI : No AVRT! (not VISTA?)"));
-        return paHostApiNotFound;
+        PRINT(("WASAPI: No AVRT! (not VISTA?)"));
+        return paNoError;
     }
 
     CoInitialize(NULL);
 
-    paWasapi = (PaWasapiHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );
+    paWasapi = (PaWasapiHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );
     if (paWasapi == NULL)
         {
@@ -864 +864 @@
     }
 
-    *hostApi = &paWasapi->inheritedHostApiRep;
+    *hostApi                             = &paWasapi->inheritedHostApiRep;
     (*hostApi)->info.structVersion               = 1;
     (*hostApi)->info.type                                = paWASAPI;
@@ -1102 +1102 @@
             break;
             default:
-                PRINT(("WASAPI device:%d bad Data FLow! \n",i));
+                PRINT(("WASAPI: device %d bad Data FLow! \n",i));
                 goto error;
             break;
@@ -1135 +1135 @@
     SAFE_RELEASE(pEndPoints);
 
-    return (result = paNoError);
+    return paNoError;
 
 error: