Skip to content

M
miniaudio
Commit 8191bb50 authored by David Reid's avatar David Reid
Browse files
Options

Fix an error where the incorrect backend is being used.

parent 74a790a5
Show whitespace changes
Inline Side-by-side
Showing with 70 additions and 50 deletions
mini_al.h
View file @ 8191bb50
...@@ -4407,34 +4407,44 @@ mal_result mal_enumerate_devices(mal_context* pContext, mal_device_type type, ma ...@@ -4407,34 +4407,44 @@ mal_result mal_enumerate_devices(mal_context* pContext, mal_device_type type, ma
{ {
if (pCount == NULL) return mal_post_error(NULL, "mal_enumerate_devices() called with invalid arguments.", MAL_INVALID_ARGS); if (pCount == NULL) return mal_post_error(NULL, "mal_enumerate_devices() called with invalid arguments.", MAL_INVALID_ARGS);
mal_result result = MAL_NO_BACKEND; switch (pContext->backend)
#ifdef MAL_ENABLE_WASAPI {
if (result != MAL_SUCCESS) { #ifdef MAL_ENABLE_WASAPI
result = mal_enumerate_devices__wasapi(pContext, type, pCount, pInfo); case mal_backend_wasapi:
} {
#endif return mal_enumerate_devices__wasapi(pContext, type, pCount, pInfo);
#ifdef MAL_ENABLE_DSOUND } break;
if (result != MAL_SUCCESS) { #endif
result = mal_enumerate_devices__dsound(pContext, type, pCount, pInfo); #ifdef MAL_ENABLE_DSOUND
} case mal_backend_dsound:
#endif {
#ifdef MAL_ENABLE_ALSA return mal_enumerate_devices__dsound(pContext, type, pCount, pInfo);
if (result != MAL_SUCCESS) { } break;
result = mal_enumerate_devices__alsa(pContext, type, pCount, pInfo); #endif
} #ifdef MAL_ENABLE_ALSA
#endif case mal_backend_alsa:
#ifdef MAL_ENABLE_OPENSLES {
if (result != MAL_SUCCESS) { return mal_enumerate_devices__alsa(pContext, type, pCount, pInfo);
result = mal_enumerate_devices__sles(pContext, type, pCount, pInfo); } break;
} #endif
#endif #ifdef MAL_ENABLE_OPENSLES
#ifdef MAL_ENABLE_NULL case mal_backend_sles:
if (result != MAL_SUCCESS) { {
result = mal_enumerate_devices__null(pContext, type, pCount, pInfo); return mal_enumerate_devices__sles(pContext, type, pCount, pInfo);
} break;
#endif
#ifdef MAL_ENABLE_NULL
case mal_backend_null:
{
return mal_enumerate_devices__null(pContext, type, pCount, pInfo);
} break;
#endif
default: break;
} }
#endif
return result; mal_assert(MAL_FALSE);
return MAL_NO_BACKEND;
} }
mal_result mal_device_init(mal_context* pContext, mal_device_type type, mal_device_id* pDeviceID, mal_device_config* pConfig, void* pUserData, mal_device* pDevice) mal_result mal_device_init(mal_context* pContext, mal_device_type type, mal_device_id* pDeviceID, mal_device_config* pConfig, void* pUserData, mal_device* pDevice)
...@@ -4502,31 +4512,41 @@ mal_result mal_device_init(mal_context* pContext, mal_device_type type, mal_devi ...@@ -4502,31 +4512,41 @@ mal_result mal_device_init(mal_context* pContext, mal_device_type type, mal_devi
mal_result result = MAL_NO_BACKEND; mal_result result = MAL_NO_BACKEND;
#ifdef MAL_ENABLE_WASAPI switch (pContext->backend)
if (result != MAL_SUCCESS) { {
#ifdef MAL_ENABLE_WASAPI
case mal_backend_wasapi:
{
result = mal_device_init__wasapi(pContext, type, pDeviceID, pConfig, pDevice); result = mal_device_init__wasapi(pContext, type, pDeviceID, pConfig, pDevice);
} } break;
#endif #endif
#ifdef MAL_ENABLE_DSOUND #ifdef MAL_ENABLE_DSOUND
if (result != MAL_SUCCESS) { case mal_backend_dsound:
{
result = mal_device_init__dsound(pContext, type, pDeviceID, pConfig, pDevice); result = mal_device_init__dsound(pContext, type, pDeviceID, pConfig, pDevice);
} } break;
#endif #endif
#ifdef MAL_ENABLE_ALSA #ifdef MAL_ENABLE_ALSA
if (result != MAL_SUCCESS) { case mal_backend_alsa:
{
result = mal_device_init__alsa(pContext, type, pDeviceID, pConfig, pDevice); result = mal_device_init__alsa(pContext, type, pDeviceID, pConfig, pDevice);
} } break;
#endif #endif
#ifdef MAL_ENABLE_OPENSLES #ifdef MAL_ENABLE_OPENSLES
if (result != MAL_SUCCESS) { case mal_backend_sles:
{
result = mal_device_init__sles(pContext, type, pDeviceID, pConfig, pDevice); result = mal_device_init__sles(pContext, type, pDeviceID, pConfig, pDevice);
} } break;
#endif #endif
#ifdef MAL_ENABLE_NULL #ifdef MAL_ENABLE_NULL
if (result != MAL_SUCCESS) { case mal_backend_null:
{
result = mal_device_init__null(pContext, type, pDeviceID, pConfig, pDevice); result = mal_device_init__null(pContext, type, pDeviceID, pConfig, pDevice);
} break;
#endif
default: break;
} }
#endif
if (result != MAL_SUCCESS) { if (result != MAL_SUCCESS) {
return MAL_NO_BACKEND; // The error message will have been posted by the source of the error. return MAL_NO_BACKEND; // The error message will have been posted by the source of the error.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment