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

Clean up to the sndio backend.

Browse Source
This commit is contained in:
David Reid
2018-07-30 03:00:24 +10:00
parent 4da8834ae4
commit a0668a89cd
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+6 -10
View File
@@ -15571,7 +15571,12 @@ mal_result mal_device_init__sndio(mal_context* pContext, mal_device_type deviceT
mal_assert(pDevice != NULL); mal_assert(pDevice != NULL);
mal_zero_object(&pDevice->sndio); mal_zero_object(&pDevice->sndio);
const char* deviceName = MAL_SIO_DEVANY; const char* deviceName;
#if defined(__FreeBSD__) || defined(__DragonFly__)
deviceName = "rsnd/0";
#else
deviceName = MAL_SIO_DEVANY;
#endif
if (pDeviceID != NULL) { if (pDeviceID != NULL) {
deviceName = pDeviceID->sndio; deviceName = pDeviceID->sndio;
} }
@@ -15715,15 +15720,6 @@ mal_result mal_device_init__sndio(mal_context* pContext, mal_device_type deviceT
return mal_post_error(pDevice, MAL_LOG_LEVEL_ERROR, "[sndio] Failed to allocate memory for intermediary buffer.", MAL_OUT_OF_MEMORY); return mal_post_error(pDevice, MAL_LOG_LEVEL_ERROR, "[sndio] Failed to allocate memory for intermediary buffer.", MAL_OUT_OF_MEMORY);
} }
// Make sure the device is put into a waiting state. It won't be started for real until audio is delivered. This
// is also called in start_backend(), however this is not a mistake. With the way mini_al works, if we don't put
// this here it's possible for sio_stop() to be called before sio_start() which causes sndio to put the handle
// into an EOF state which then causes everything thereafter to fail.
if (((mal_sio_start_proc)pDevice->pContext->sndio.sio_start)((struct mal_sio_hdl*)pDevice->sndio.handle) == 0) {
((mal_sio_close_proc)pContext->sndio.sio_close)((struct mal_sio_hdl*)pDevice->sndio.handle);
return mal_post_error(pDevice, MAL_LOG_LEVEL_ERROR, "[sndio] Failed to start backend device.", MAL_FAILED_TO_START_BACKEND_DEVICE);
}
#ifdef MAL_DEBUG_OUTPUT #ifdef MAL_DEBUG_OUTPUT
printf("DEVICE INFO\n"); printf("DEVICE INFO\n");
printf(" Format: %s\n", mal_get_format_name(pDevice->internalFormat)); printf(" Format: %s\n", mal_get_format_name(pDevice->internalFormat));