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

ALSA: Add a timeout to poll().

Browse Source 
I don't trust there won't be edge cases that result in this getting
stuck forever.
This commit is contained in:
David Reid
2026-01-11 07:22:44 +10:00
parent adce75cba6
commit c4c484794b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+14 -3
View File
@@ -29846,7 +29846,7 @@ static ma_result ma_device_step__alsa(ma_device* pDevice, ma_blocking_mode block
ma_device_state_alsa* pDeviceStateALSA = ma_device_get_backend_state__alsa(pDevice); ma_device_state_alsa* pDeviceStateALSA = ma_device_get_backend_state__alsa(pDevice);
ma_context_state_alsa* pContextStateALSA = ma_context_get_backend_state__alsa(ma_device_get_context(pDevice)); ma_context_state_alsa* pContextStateALSA = ma_context_get_backend_state__alsa(ma_device_get_context(pDevice));
ma_device_type deviceType = ma_device_get_type(pDevice); ma_device_type deviceType = ma_device_get_type(pDevice);
int timeout = (blockingMode == MA_BLOCKING_MODE_BLOCKING) ? -1 : 0; int timeout = (blockingMode == MA_BLOCKING_MODE_BLOCKING) ? 2000 : 0;
int resultALSA; int resultALSA;
int resultPoll; int resultPoll;
unsigned short revents; unsigned short revents;
@@ -29869,8 +29869,19 @@ static ma_result ma_device_step__alsa(ma_device* pDevice, ma_blocking_mode block
return MA_ERROR; return MA_ERROR;
} }
if (resultPoll == 0) {
return MA_SUCCESS; /* Timeout. */
/*
In the case of a timeout, this is expected for for non-blocking mode and should not be
considered an error. In blocking mode however, we should never be getting a timeout. In
this case it probably means the PCM is stuck. We'll treat this as an error.
*/
if (resultPoll == 0) { /* Timeout. */
if (blockingMode == MA_BLOCKING_MODE_NON_BLOCKING) {
return MA_SUCCESS;
} else {
return MA_ERROR;
}
} }
/* Check if the wakeup fd was triggered before checking anything else. */ /* Check if the wakeup fd was triggered before checking anything else. */