mirror/miniaudio
1
0
Fork 0
mirror of https://github.com/mackron/miniaudio.git synced 2026-04-22 00:06:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warnings on the Windows/GCC build.

Browse Source
This commit is contained in:
David Reid
2019-03-06 21:43:03 +10:00
parent 4a9a2f3b58
commit 265d752569
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+7 -8
View File
@@ -6542,16 +6542,16 @@ HRESULT STDMETHODCALLTYPE ma_IMMNotificationClient_OnDefaultDeviceChanged(ma_IMM
} }
// We only care about devices with the same data flow and role as the current device. // We only care about devices with the same data flow and role as the current device.
if (pThis->pDevice->type == ma_device_type_playback && dataFlow != ma_eRender || if ((pThis->pDevice->type == ma_device_type_playback && dataFlow != ma_eRender) ||
pThis->pDevice->type == ma_device_type_capture && dataFlow != ma_eCapture) { (pThis->pDevice->type == ma_device_type_capture && dataFlow != ma_eCapture)) {
return S_OK; return S_OK;
} }
// Not currently supporting automatic stream routing in exclusive mode. This is not working correctly on my machine due to // Not currently supporting automatic stream routing in exclusive mode. This is not working correctly on my machine due to
// AUDCLNT_E_DEVICE_IN_USE errors when reinitializing the device. If this is a bug in miniaudio, we can try re-enabling this once // AUDCLNT_E_DEVICE_IN_USE errors when reinitializing the device. If this is a bug in miniaudio, we can try re-enabling this once
// it's fixed. // it's fixed.
if (dataFlow == ma_eRender && pThis->pDevice->playback.shareMode == ma_share_mode_exclusive || if ((dataFlow == ma_eRender && pThis->pDevice->playback.shareMode == ma_share_mode_exclusive) ||
dataFlow == ma_eCapture && pThis->pDevice->capture.shareMode == ma_share_mode_exclusive) { (dataFlow == ma_eCapture && pThis->pDevice->capture.shareMode == ma_share_mode_exclusive)) {
return S_OK; return S_OK;
} }
@@ -8243,7 +8243,7 @@ ma_result ma_device_main_loop__wasapi(ma_device* pDevice)
} }
} break; } break;
default: MA_INVALID_ARGS; default: return MA_INVALID_ARGS;
} }
} }
@@ -10494,14 +10494,13 @@ void ma_device_uninit__winmm(ma_device* pDevice)
{ {
ma_assert(pDevice != NULL); ma_assert(pDevice != NULL);
((MA_PFN_waveOutReset)pDevice->pContext->winmm.waveOutReset);
if (pDevice->type == ma_device_type_capture || pDevice->type == ma_device_type_duplex) { if (pDevice->type == ma_device_type_capture || pDevice->type == ma_device_type_duplex) {
((MA_PFN_waveInClose)pDevice->pContext->winmm.waveInClose)((HWAVEIN)pDevice->winmm.hDeviceCapture); ((MA_PFN_waveInClose)pDevice->pContext->winmm.waveInClose)((HWAVEIN)pDevice->winmm.hDeviceCapture);
CloseHandle((HANDLE)pDevice->winmm.hEventCapture); CloseHandle((HANDLE)pDevice->winmm.hEventCapture);
} }
if (pDevice->type == ma_device_type_playback) { if (pDevice->type == ma_device_type_playback || pDevice->type == ma_device_type_duplex) {
((MA_PFN_waveOutReset)pDevice->pContext->winmm.waveOutReset)((HWAVEOUT)pDevice->winmm.hDevicePlayback);
((MA_PFN_waveOutClose)pDevice->pContext->winmm.waveOutClose)((HWAVEOUT)pDevice->winmm.hDevicePlayback); ((MA_PFN_waveOutClose)pDevice->pContext->winmm.waveOutClose)((HWAVEOUT)pDevice->winmm.hDevicePlayback);
CloseHandle((HANDLE)pDevice->winmm.hEventPlayback); CloseHandle((HANDLE)pDevice->winmm.hEventPlayback);
} }