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

Some cleanup to the new audio thread.

Browse Source
This commit is contained in:
David Reid
2025-08-11 06:47:49 +10:00
parent fa5f282d65
commit 87dee0e20c
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
miniaudio.h
+13 -13
View File
@@ -44176,10 +44176,11 @@ static ma_thread_result MA_THREADCALL ma_audio_thread(void* pData)
result = ma_device_op_do_start(pDevice, pOp->pCompletionEvent); result = ma_device_op_do_start(pDevice, pOp->pCompletionEvent);
if (result == MA_SUCCESS) { if (result == MA_SUCCESS) {
/* At this point the device has started. We now need to enter the main data loop. */ /* If the backend is asynchronous, it'll be running it's own loop. No need for us to do it here. */
ma_device_op dummyStop; if (ma_context_is_backend_asynchronous(ma_device_get_context(pDevice))) {
continue; /* <-- This just makes the audio thread wait for a new operation to arrive, like an uninit or stop. */
/* Loop. */ } else {
/* Getting here means we need to manage the loop ourselves. */
if (pDevice->pContext->pVTable->onDeviceLoop != NULL) { if (pDevice->pContext->pVTable->onDeviceLoop != NULL) {
pDevice->pContext->pVTable->onDeviceLoop(pDevice); pDevice->pContext->pVTable->onDeviceLoop(pDevice);
} else { } else {
@@ -44187,22 +44188,21 @@ static ma_thread_result MA_THREADCALL ma_audio_thread(void* pData)
ma_device_audio_thread__default_read_write(pDevice); ma_device_audio_thread__default_read_write(pDevice);
} }
/* The only op allowed at this point is a stop. ma_device_stop() will have posted a stop op so we'll need to grab it from the queue and process it. */ /* The only op allowed at this point is a stop. ma_device_stop() will likely have posted a stop op so we'll need to grab it from the queue and process it. */
result = ma_device_op_queue_next(&pDevice->opQueue, MA_BLOCKING_MODE_NON_BLOCKING, &pOp); result = ma_device_op_queue_next(&pDevice->opQueue, MA_BLOCKING_MODE_NON_BLOCKING, &pOp);
if (result != MA_SUCCESS) { if (result == MA_SUCCESS) {
/* There is no stop op on the queue which means the backend itself must have terminated from its loop. We'll use a dummy stop event here. */
MA_ZERO_OBJECT(&dummyStop);
dummyStop.type = MA_DEVICE_OP_STOP;
pOp = &dummyStop;
}
if (pOp->type == MA_DEVICE_OP_STOP) { if (pOp->type == MA_DEVICE_OP_STOP) {
ma_device_op_do_stop(pDevice, pOp->pCompletionEvent); ma_device_op_do_stop(pDevice, pOp->pCompletionEvent);
} else { } else {
MA_ASSERT(!"Expecting a stop op, but got something else."); MA_ASSERT(!"Expecting a stop op, but got something else.");
} }
} else { } else {
/* Starting the device failed. */ /* There is no stop op on the queue which means the backend itself must have terminated from its loop. We'll use a dummy stop event here. */
ma_device_op_do_stop(pDevice, NULL);
}
}
} else {
ma_log_postf(ma_device_get_log(pDevice), MA_LOG_LEVEL_ERROR, "Failed to start device: %s.", ma_result_description(result));
} }
} else if (pOp->type == MA_DEVICE_OP_STOP) { } else if (pOp->type == MA_DEVICE_OP_STOP) {
/* /*