]> Repos - portaudio/commitdiff
wasapi: fixed initialization stage of PaWasapi_Initialize() which was returning error...
authordmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Thu, 4 Mar 2010 11:02:06 +0000 (11:02 +0000)
committerdmitrykos <dmitrykos@0f58301d-fd10-0410-b4af-bbb618454e57>
Thu, 4 Mar 2010 11:02:06 +0000 (11:02 +0000)
src/hostapi/wasapi/pa_win_wasapi.c

index 75813b840fb15f76f425ea3f60e421afa1d4f0b3..e55eed166f4f30536e603457c0b4dec87a4f5551 100644 (file)
@@ -834,7 +834,7 @@ static BOOL UseWOW64VistaWorkaround()
 // ------------------------------------------------------------------------------------------\r
 PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex )\r
 {\r
-    PaError result = paUnanticipatedHostError;\r
+    PaError result = paNoError;\r
     PaWasapiHostApiRepresentation *paWasapi;\r
     PaDeviceInfo *deviceInfoArray;\r
     HRESULT hResult = S_OK;\r
@@ -843,13 +843,13 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
 \r
     if (!SetupAVRT())\r
        {\r
-        PRINT(("Windows WASAPI : No AVRT! (not VISTA?)"));\r
-        return paHostApiNotFound;\r
+        PRINT(("WASAPI: No AVRT! (not VISTA?)"));\r
+        return paNoError;\r
     }\r
 \r
     CoInitialize(NULL);\r
 \r
-    paWasapi = (PaWasapiHostApiRepresentation*)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );\r
+    paWasapi = (PaWasapiHostApiRepresentation *)PaUtil_AllocateMemory( sizeof(PaWasapiHostApiRepresentation) );\r
     if (paWasapi == NULL)\r
        {\r
         result = paInsufficientMemory;\r
@@ -863,7 +863,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
         goto error;\r
     }\r
 \r
-    *hostApi = &paWasapi->inheritedHostApiRep;\r
+    *hostApi                             = &paWasapi->inheritedHostApiRep;\r
     (*hostApi)->info.structVersion              = 1;\r
     (*hostApi)->info.type                               = paWASAPI;\r
     (*hostApi)->info.name                               = "Windows WASAPI";\r
@@ -1101,7 +1101,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
                 deviceInfo->defaultLowInputLatency  = nano100ToSeconds(paWasapi->devInfo[i].MinimumDevicePeriod);\r
             break;\r
             default:\r
-                PRINT(("WASAPI device:%d bad Data FLow! \n",i));\r
+                PRINT(("WASAPI: device %d bad Data FLow! \n",i));\r
                 goto error;\r
             break;\r
             }\r
@@ -1134,7 +1134,7 @@ PaError PaWasapi_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiInd
 \r
     SAFE_RELEASE(pEndPoints);\r
 \r
-    return (result = paNoError);\r
+    return paNoError;\r
 \r
 error:\r
 \r