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

WinMM, DirectSound: Add support for default device detection.

Browse Source 
Public issue https://github.com/mackron/miniaudio/issues/126
This commit is contained in:
David Reid
2020-11-01 18:39:32 +10:00
parent 9b4e524b3f
commit a1052923b0
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+17
View File
@@ -15079,6 +15079,7 @@ static BOOL CALLBACK ma_context_enumerate_devices_callback__dsound(LPGUID lpGuid
MA_COPY_MEMORY(deviceInfo.id.dsound, lpGuid, 16); MA_COPY_MEMORY(deviceInfo.id.dsound, lpGuid, 16);
} else { } else {
MA_ZERO_MEMORY(deviceInfo.id.dsound, 16); MA_ZERO_MEMORY(deviceInfo.id.dsound, 16);
deviceInfo._private.isDefault = MA_TRUE;
} }
/* Name / Description */ /* Name / Description */
@@ -15140,6 +15141,7 @@ static BOOL CALLBACK ma_context_get_device_info_callback__dsound(LPGUID lpGuid,
if ((pData->pDeviceID == NULL || ma_is_guid_null(pData->pDeviceID->dsound)) && (lpGuid == NULL || ma_is_guid_null(lpGuid))) { if ((pData->pDeviceID == NULL || ma_is_guid_null(pData->pDeviceID->dsound)) && (lpGuid == NULL || ma_is_guid_null(lpGuid))) {
/* Default device. */ /* Default device. */
ma_strncpy_s(pData->pDeviceInfo->name, sizeof(pData->pDeviceInfo->name), lpcstrDescription, (size_t)-1); ma_strncpy_s(pData->pDeviceInfo->name, sizeof(pData->pDeviceInfo->name), lpcstrDescription, (size_t)-1);
pData->pDeviceInfo->_private.isDefault = MA_TRUE;
pData->found = MA_TRUE; pData->found = MA_TRUE;
return FALSE; /* Stop enumeration. */ return FALSE; /* Stop enumeration. */
} else { } else {
@@ -16628,6 +16630,11 @@ static ma_result ma_context_enumerate_devices__winmm(ma_context* pContext, ma_en
MA_ZERO_OBJECT(&deviceInfo); MA_ZERO_OBJECT(&deviceInfo);
deviceInfo.id.winmm = iPlaybackDevice; deviceInfo.id.winmm = iPlaybackDevice;
/* The first enumerated device is the default device. */
if (iPlaybackDevice == 0) {
deviceInfo._private.isDefault = MA_TRUE;
}
if (ma_context_get_device_info_from_WAVEOUTCAPS2(pContext, &caps, &deviceInfo) == MA_SUCCESS) { if (ma_context_get_device_info_from_WAVEOUTCAPS2(pContext, &caps, &deviceInfo) == MA_SUCCESS) {
ma_bool32 cbResult = callback(pContext, ma_device_type_playback, &deviceInfo, pUserData); ma_bool32 cbResult = callback(pContext, ma_device_type_playback, &deviceInfo, pUserData);
if (cbResult == MA_FALSE) { if (cbResult == MA_FALSE) {
@@ -16652,6 +16659,11 @@ static ma_result ma_context_enumerate_devices__winmm(ma_context* pContext, ma_en
MA_ZERO_OBJECT(&deviceInfo); MA_ZERO_OBJECT(&deviceInfo);
deviceInfo.id.winmm = iCaptureDevice; deviceInfo.id.winmm = iCaptureDevice;
/* The first enumerated device is the default device. */
if (iCaptureDevice == 0) {
deviceInfo._private.isDefault = MA_TRUE;
}
if (ma_context_get_device_info_from_WAVEINCAPS2(pContext, &caps, &deviceInfo) == MA_SUCCESS) { if (ma_context_get_device_info_from_WAVEINCAPS2(pContext, &caps, &deviceInfo) == MA_SUCCESS) {
ma_bool32 cbResult = callback(pContext, ma_device_type_capture, &deviceInfo, pUserData); ma_bool32 cbResult = callback(pContext, ma_device_type_capture, &deviceInfo, pUserData);
if (cbResult == MA_FALSE) { if (cbResult == MA_FALSE) {
@@ -16681,6 +16693,11 @@ static ma_result ma_context_get_device_info__winmm(ma_context* pContext, ma_devi
pDeviceInfo->id.winmm = winMMDeviceID; pDeviceInfo->id.winmm = winMMDeviceID;
/* The first ID is the default device. */
if (winMMDeviceID == 0) {
pDeviceInfo->_private.isDefault = MA_TRUE;
}
if (deviceType == ma_device_type_playback) { if (deviceType == ma_device_type_playback) {
MMRESULT result; MMRESULT result;
MA_WAVEOUTCAPS2A caps; MA_WAVEOUTCAPS2A caps;