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

Fix some thread-safety issues with callbacks.

Browse Source
This commit is contained in:
David Reid
2016-10-20 21:22:11 +10:00
parent 6ed399d57b
commit 05c85e5bd2
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mini_al.h
+16 -12
View File
@@ -1058,8 +1058,11 @@ mal_bool32 mal_event_signal(mal_event* pEvent)
// Posts a log message. // Posts a log message.
static void mal_log(mal_device* pDevice, const char* message) static void mal_log(mal_device* pDevice, const char* message)
{ {
if (pDevice && pDevice->onLog) { if (pDevice == NULL) return;
pDevice->onLog(pDevice, message);
mal_log_proc onLog = pDevice->onLog;
if (onLog) {
onLog(pDevice, message);
} }
} }
@@ -1081,7 +1084,9 @@ static inline mal_uint32 mal_device__read_frames_from_client(mal_device* pDevice
mal_assert(pSamples != NULL); mal_assert(pSamples != NULL);
mal_uint32 samplesRead = 0; mal_uint32 samplesRead = 0;
if (pDevice->onSend) {
mal_send_proc onSend = pDevice->onSend;
if (onSend) {
samplesRead = pDevice->onSend(pDevice, frameCount * pDevice->channels, pSamples); samplesRead = pDevice->onSend(pDevice, frameCount * pDevice->channels, pSamples);
} }
@@ -1100,8 +1105,9 @@ static inline void mal_device__send_frames_to_client(mal_device* pDevice, mal_ui
mal_assert(frameCount > 0); mal_assert(frameCount > 0);
mal_assert(pSamples != NULL); mal_assert(pSamples != NULL);
if (pDevice->onRecv) { mal_recv_proc onRecv = pDevice->onRecv;
pDevice->onRecv(pDevice, frameCount * pDevice->channels, pSamples); if (onRecv) {
onRecv(pDevice, frameCount * pDevice->channels, pSamples);
} }
} }
@@ -2138,7 +2144,7 @@ static mal_bool32 mal_device_read__alsa(mal_device* pDevice)
return MAL_FALSE; return MAL_FALSE;
} }
mal_uint32 samplesToSend = 0; mal_uint32 framesToSend = 0;
void* pBuffer = NULL; void* pBuffer = NULL;
if (pDevice->alsa.pIntermediaryBuffer == NULL) { if (pDevice->alsa.pIntermediaryBuffer == NULL) {
// mmap. // mmap.
@@ -2200,13 +2206,12 @@ static mal_bool32 mal_device_read__alsa(mal_device* pDevice)
} }
} }
samplesToSend = framesRead * pDevice->channels; framesToSend = framesRead * pDevice->channels;
pBuffer = pDevice->alsa.pIntermediaryBuffer; pBuffer = pDevice->alsa.pIntermediaryBuffer;
} }
if (samplesToSend > 0) {
if (pDevice->onRecv && samplesToSend > 0) { mal_device__send_frames_to_client(pDevice, framesToSend, pBuffer);
pDevice->onRecv(pDevice, samplesToSend, pBuffer);
} }
@@ -3130,13 +3135,12 @@ mal_uint32 mal_get_sample_size_in_bytes(mal_format format)
// ================ // ================
// //
// v0.1 - TBD // v0.1 - TBD
// - Initial versioned release // - Initial versioned release.
// TODO // TODO
// ==== // ====
// - DirectSound: Remove notification events. // - DirectSound: Remove notification events.
// - onSend and onRecv usage isn't thread-safe.
// //
// //
// ALSA // ALSA