Commit 57bc1a28 authored by David Reid's avatar David Reid

API CHANGE: Remove shareMode parameter from ma_context_get_device_info.

parent 01c8b8d9
...@@ -4721,10 +4721,6 @@ deviceType (in) ...@@ -4721,10 +4721,6 @@ deviceType (in)
pDeviceID (in) pDeviceID (in)
The ID of the device being queried. The ID of the device being queried.
shareMode (in)
The share mode to query for device capabilities. This should be set to whatever you're intending on using when initializing the device. If you're unsure,
set this to `ma_share_mode_shared`.
pDeviceInfo (out) pDeviceInfo (out)
A pointer to the `ma_device_info` structure that will receive the device information. A pointer to the `ma_device_info` structure that will receive the device information.
...@@ -4750,7 +4746,7 @@ the requested share mode is unsupported. ...@@ -4750,7 +4746,7 @@ the requested share mode is unsupported.
This leaves pDeviceInfo unmodified in the result of an error. This leaves pDeviceInfo unmodified in the result of an error.
*/ */
MA_API ma_result ma_context_get_device_info(ma_context* pContext, ma_device_type deviceType, const ma_device_id* pDeviceID, ma_share_mode shareMode, ma_device_info* pDeviceInfo); MA_API ma_result ma_context_get_device_info(ma_context* pContext, ma_device_type deviceType, const ma_device_id* pDeviceID, ma_device_info* pDeviceInfo);
/* /*
Determines if the given context supports loopback mode. Determines if the given context supports loopback mode.
...@@ -33300,13 +33296,11 @@ MA_API ma_result ma_context_get_devices(ma_context* pContext, ma_device_info** p ...@@ -33300,13 +33296,11 @@ MA_API ma_result ma_context_get_devices(ma_context* pContext, ma_device_info** p
return result; return result;
} }
MA_API ma_result ma_context_get_device_info(ma_context* pContext, ma_device_type deviceType, const ma_device_id* pDeviceID, ma_share_mode shareMode, ma_device_info* pDeviceInfo) MA_API ma_result ma_context_get_device_info(ma_context* pContext, ma_device_type deviceType, const ma_device_id* pDeviceID, ma_device_info* pDeviceInfo)
{ {
ma_result result; ma_result result;
ma_device_info deviceInfo; ma_device_info deviceInfo;
(void)shareMode; /* Unused. This parameter will be removed in version 0.11. */
/* NOTE: Do not clear pDeviceInfo on entry. The reason is the pDeviceID may actually point to pDeviceInfo->id which will break things. */ /* NOTE: Do not clear pDeviceInfo on entry. The reason is the pDeviceID may actually point to pDeviceInfo->id which will break things. */
if (pContext == NULL || pDeviceInfo == NULL) { if (pContext == NULL || pDeviceInfo == NULL) {
return MA_INVALID_ARGS; return MA_INVALID_ARGS;
...@@ -33576,7 +33570,7 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC ...@@ -33576,7 +33570,7 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC
ma_device_info deviceInfo; ma_device_info deviceInfo;
if (pConfig->deviceType == ma_device_type_capture || pConfig->deviceType == ma_device_type_duplex || pConfig->deviceType == ma_device_type_loopback) { if (pConfig->deviceType == ma_device_type_capture || pConfig->deviceType == ma_device_type_duplex || pConfig->deviceType == ma_device_type_loopback) {
result = ma_context_get_device_info(pContext, (pConfig->deviceType == ma_device_type_loopback) ? ma_device_type_playback : ma_device_type_capture, descriptorCapture.pDeviceID, descriptorCapture.shareMode, &deviceInfo); result = ma_context_get_device_info(pContext, (pConfig->deviceType == ma_device_type_loopback) ? ma_device_type_playback : ma_device_type_capture, descriptorCapture.pDeviceID, &deviceInfo);
if (result == MA_SUCCESS) { if (result == MA_SUCCESS) {
ma_strncpy_s(pDevice->capture.name, sizeof(pDevice->capture.name), deviceInfo.name, (size_t)-1); ma_strncpy_s(pDevice->capture.name, sizeof(pDevice->capture.name), deviceInfo.name, (size_t)-1);
} else { } else {
...@@ -33590,7 +33584,7 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC ...@@ -33590,7 +33584,7 @@ MA_API ma_result ma_device_init(ma_context* pContext, const ma_device_config* pC
} }
if (pConfig->deviceType == ma_device_type_playback || pConfig->deviceType == ma_device_type_duplex) { if (pConfig->deviceType == ma_device_type_playback || pConfig->deviceType == ma_device_type_duplex) {
result = ma_context_get_device_info(pContext, ma_device_type_playback, descriptorPlayback.pDeviceID, descriptorPlayback.shareMode, &deviceInfo); result = ma_context_get_device_info(pContext, ma_device_type_playback, descriptorPlayback.pDeviceID, &deviceInfo);
if (result == MA_SUCCESS) { if (result == MA_SUCCESS) {
ma_strncpy_s(pDevice->playback.name, sizeof(pDevice->playback.name), deviceInfo.name, (size_t)-1); ma_strncpy_s(pDevice->playback.name, sizeof(pDevice->playback.name), deviceInfo.name, (size_t)-1);
} else { } else {
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