Revision | d408446fdf34ec28d733f8654ba122bea38ec50b (tree) |
---|---|
Time | 2020-05-10 19:14:49 |
Author | Starg <starg@user...> |
Commiter | Starg |
[wasapi] Minor fixes
@@ -629,11 +629,12 @@ static void print_device_list(void) | ||
629 | 629 | goto error1; |
630 | 630 | LatencyMax = 100000; |
631 | 631 | LatencyMin = 30000; |
632 | - if(FAILED(IMMDevice_Activate(defdev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
633 | - LatencyMin = LatencyMin; | |
634 | - }else if(FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))){ | |
635 | - LatencyMin = LatencyMin; | |
636 | - } | |
632 | + if(SUCCEEDED(IMMDevice_Activate(defdev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
633 | + if (FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))) { | |
634 | + LatencyMax = 100000; | |
635 | + LatencyMin = 30000; | |
636 | + } | |
637 | + } | |
637 | 638 | LatencyMax /= 10000; // hns to ms |
638 | 639 | LatencyMin /= 10000; // hns to ms |
639 | 640 | if(LatencyMax > 1000) |
@@ -682,8 +683,11 @@ static void print_device_list(void) | ||
682 | 683 | PropVariantClear(&value); |
683 | 684 | LatencyMax = 100000; |
684 | 685 | LatencyMin = 30000; |
685 | - if(FAILED(IMMDevice_Activate(dev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
686 | - }else if(FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))){ | |
686 | + if(SUCCEEDED(IMMDevice_Activate(dev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
687 | + if (FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))) { | |
688 | + LatencyMax = 100000; | |
689 | + LatencyMin = 30000; | |
690 | + } | |
687 | 691 | } |
688 | 692 | LatencyMax /= 10000; // hns to ms |
689 | 693 | LatencyMin /= 10000; // hns to ms |
@@ -1218,11 +1222,12 @@ int wasapi_device_list(WASAPI_DEVICELIST *device) | ||
1218 | 1222 | goto error1; |
1219 | 1223 | LatencyMax = 100000; |
1220 | 1224 | LatencyMin = 30000; |
1221 | - if(FAILED(IMMDevice_Activate(defdev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
1222 | - LatencyMin = LatencyMin; | |
1223 | - }else if(FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))){ | |
1224 | - LatencyMin = LatencyMin; | |
1225 | - } | |
1225 | + if(SUCCEEDED(IMMDevice_Activate(defdev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
1226 | + if (FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))) { | |
1227 | + LatencyMax = 100000; | |
1228 | + LatencyMin = 30000; | |
1229 | + } | |
1230 | + } | |
1226 | 1231 | LatencyMax /= 10000; // hns to ms |
1227 | 1232 | LatencyMin /= 10000; // hns to ms |
1228 | 1233 | if(LatencyMax > 1000) |
@@ -1271,8 +1276,11 @@ int wasapi_device_list(WASAPI_DEVICELIST *device) | ||
1271 | 1276 | PropVariantClear(&value); |
1272 | 1277 | LatencyMax = 100000; |
1273 | 1278 | LatencyMin = 30000; |
1274 | - if(FAILED(IMMDevice_Activate(dev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
1275 | - }else if(FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))){ | |
1279 | + if(SUCCEEDED(IMMDevice_Activate(dev, &tim_IID_IAudioClient, CLSCTX_ALL, NULL, (void **)&tmpClient))){ | |
1280 | + if (FAILED(IAudioClient_GetDevicePeriod(tmpClient, &LatencyMax, &LatencyMin))) { | |
1281 | + LatencyMax = 100000; | |
1282 | + LatencyMin = 30000; | |
1283 | + } | |
1276 | 1284 | } |
1277 | 1285 | LatencyMax /= 10000; // hns to ms |
1278 | 1286 | LatencyMin /= 10000; // hns to ms |