Skip to content

Commit c3cedfa

Browse files
committed
Revert "audio: Fix a race condition in miniaudio"
This reverts commit e60f7c0.
1 parent 984ce18 commit c3cedfa

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/audio/internal/thirdparty/miniaudio/miniaudio.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18616,20 +18616,15 @@ static ma_pa_buffer_attr ma_device__pa_buffer_attr_new(ma_uint32 periodSizeInFra
1861618616
static ma_pa_stream* ma_device__pa_stream_new__pulse(ma_device* pDevice, const char* pStreamName, const ma_pa_sample_spec* ss, const ma_pa_channel_map* cmap)
1861718617
{
1861818618
static int g_StreamCounter = 0;
18619-
static ma_mutex g_StreamCounterMutex;
1862018619
char actualStreamName[256];
1862118620

18622-
ma_mutex_lock(&g_StreamCounterMutex);
18623-
{
18624-
if (pStreamName != NULL) {
18625-
ma_strncpy_s(actualStreamName, sizeof(actualStreamName), pStreamName, (size_t)-1);
18626-
} else {
18627-
ma_strcpy_s(actualStreamName, sizeof(actualStreamName), "miniaudio:");
18628-
ma_itoa_s(g_StreamCounter, actualStreamName + 8, sizeof(actualStreamName)-8, 10); /* 8 = strlen("miniaudio:") */
18629-
}
18630-
g_StreamCounter += 1;
18621+
if (pStreamName != NULL) {
18622+
ma_strncpy_s(actualStreamName, sizeof(actualStreamName), pStreamName, (size_t)-1);
18623+
} else {
18624+
ma_strcpy_s(actualStreamName, sizeof(actualStreamName), "miniaudio:");
18625+
ma_itoa_s(g_StreamCounter, actualStreamName + 8, sizeof(actualStreamName)-8, 10); /* 8 = strlen("miniaudio:") */
1863118626
}
18632-
ma_mutex_unlock(&g_StreamCounterMutex);
18627+
g_StreamCounter += 1;
1863318628

1863418629
return ((ma_pa_stream_new_proc)pDevice->pContext->pulse.pa_stream_new)((ma_pa_context*)pDevice->pulse.pPulseContext, actualStreamName, ss, cmap);
1863518630
}

0 commit comments

Comments
 (0)