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

Fix some errors and warnings with the UWP build.

Browse Source
This commit is contained in:
David Reid
2022-09-09 14:17:23 +10:00
parent ceaa0df09b
commit dc5d99462d
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+11 -5
View File
@@ -3766,7 +3766,7 @@ typedef ma_uint16 wchar_t;
#elif defined(WINAPI_FAMILY) && (defined(WINAPI_FAMILY_GAMES) && WINAPI_FAMILY == WINAPI_FAMILY_GAMES) #elif defined(WINAPI_FAMILY) && (defined(WINAPI_FAMILY_GAMES) && WINAPI_FAMILY == WINAPI_FAMILY_GAMES)
#define MA_WIN32_GDK #define MA_WIN32_GDK
#else #else
#define MA_WIN32_DESKTOP #define MA_WIN32_UWP
#endif #endif
#else #else
#define MA_POSIX #define MA_POSIX
@@ -20503,6 +20503,10 @@ static ma_result ma_context_get_device_info_from_IAudioClient__wasapi(ma_context
ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_WARNING, "[WASAPI] Failed to open property store for device info retrieval."); ma_log_postf(ma_context_get_log(pContext), MA_LOG_LEVEL_WARNING, "[WASAPI] Failed to open property store for device info retrieval.");
} }
} }
#else
{
(void)pMMDevice; /* Unused. */
}
#endif #endif
return MA_SUCCESS; return MA_SUCCESS;
@@ -20807,10 +20811,10 @@ static ma_result ma_context_get_IAudioClient_UWP__wasapi(ma_context* pContext, m
if (pDeviceID != NULL) { if (pDeviceID != NULL) {
MA_COPY_MEMORY(&iid, pDeviceID->wasapi, sizeof(iid)); MA_COPY_MEMORY(&iid, pDeviceID->wasapi, sizeof(iid));
} else { } else {
if (deviceType == ma_device_type_playback) { if (deviceType == ma_device_type_capture) {
iid = MA_IID_DEVINTERFACE_AUDIO_RENDER;
} else {
iid = MA_IID_DEVINTERFACE_AUDIO_CAPTURE; iid = MA_IID_DEVINTERFACE_AUDIO_CAPTURE;
} else {
iid = MA_IID_DEVINTERFACE_AUDIO_RENDER;
} }
} }
@@ -21065,7 +21069,7 @@ static ma_result ma_context_get_device_info__wasapi(ma_context* pContext, ma_dev
ma_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MA_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1); ma_strncpy_s(pDeviceInfo->name, sizeof(pDeviceInfo->name), MA_DEFAULT_CAPTURE_DEVICE_NAME, (size_t)-1);
} }
result = ma_context_get_IAudioClient_UWP__wasapi(pContext, deviceType, pDeviceID, &pAudioClient, NULL); result = ma_context_get_IAudioClient_UWP__wasapi(pContext, deviceType, pDeviceID, NULL, &pAudioClient, NULL);
if (result != MA_SUCCESS) { if (result != MA_SUCCESS) {
return result; return result;
} }
@@ -39433,6 +39437,8 @@ static ma_result ma_context_init_backend_apis__win32(ma_context* pContext)
pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegOpenKeyExA"); pContext->win32.RegOpenKeyExA = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegOpenKeyExA");
pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegCloseKey"); pContext->win32.RegCloseKey = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegCloseKey");
pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegQueryValueExA"); pContext->win32.RegQueryValueExA = (ma_proc)ma_dlsym(pContext, pContext->win32.hAdvapi32DLL, "RegQueryValueExA");
#else
(void)pContext; /* Unused. */
#endif #endif
ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE); ma_CoInitializeEx(pContext, NULL, MA_COINIT_VALUE);