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

AAudio: Explicitly stop the device in the event of a reroute failure.

Browse Source 
This commit removes the calls to ma_device__set_state() and replaces
them with a call to ma_device_stop() which is the intended way for
backends to change the state of the device. In addition, this comes
with the added effect of firing the stop callback when a reroute fails.
This commit is contained in:
David Reid
2025-01-04 18:13:54 +10:00
parent 08152a6a6d
commit 6e1b0dbce4
1 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+21 -3
View File
@@ -38194,6 +38194,10 @@ static ma_result ma_device_start_stream__aaudio(ma_device* pDevice, ma_AAudioStr
MA_ASSERT(pDevice != NULL);
if (pStream == NULL) {
return MA_INVALID_ARGS;
}
resultAA = ((MA_PFN_AAudioStream_requestStart)pDevice->pContext->aaudio.AAudioStream_requestStart)(pStream);
if (resultAA != MA_AAUDIO_OK) {
return ma_result_from_aaudio(resultAA);
@@ -38226,6 +38230,10 @@ static ma_result ma_device_stop_stream__aaudio(ma_device* pDevice, ma_AAudioStre
MA_ASSERT(pDevice != NULL);
if (pStream == NULL) {
return MA_INVALID_ARGS;
}
/*
From the AAudio documentation:
@@ -38380,7 +38388,6 @@ error_disconnected:
result = ma_device_init__aaudio(pDevice, &deviceConfig, &descriptorPlayback, &descriptorCapture);
if (result != MA_SUCCESS) {
ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to create stream after route change.");
ma_device__set_state(pDevice, ma_device_state_stopped);
return result;
}
@@ -38388,7 +38395,6 @@ error_disconnected:
if (result != MA_SUCCESS) {
ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_WARNING, "[AAudio] Failed to initialize device after route change.");
ma_device_uninit__aaudio(pDevice);
ma_device__set_state(pDevice, ma_device_state_stopped);
return result;
}
@@ -38546,6 +38552,7 @@ static ma_result ma_context_init__aaudio(ma_context* pContext, const ma_context_
static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob)
{
ma_result result;
ma_device* pDevice;
MA_ASSERT(pJob != NULL);
@@ -38554,7 +38561,18 @@ static ma_result ma_job_process__device__aaudio_reroute(ma_job* pJob)
MA_ASSERT(pDevice != NULL);
/* Here is where we need to reroute the device. To do this we need to uninitialize the stream and reinitialize it. */
return ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType);
result = ma_device_reinit__aaudio(pDevice, (ma_device_type)pJob->data.device.aaudio.reroute.deviceType);
if (result != MA_SUCCESS) {
/*
Getting here means we failed to reroute the device. The best thing I can think of here is to
just stop the device.
*/
ma_log_post(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "[AAudio] Stopping device due to reroute failure.");
ma_device_stop(pDevice);
return result;
}
return MA_SUCCESS;
}
#else
/* Getting here means there is no AAudio backend so we need a no-op job implementation. */