blob: eb6bd240051a607395c07772e6c44ce4bcaa45a5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
commit 7ead713f6b67c0247e248de3709cc383da19bdea
Author: Andrew Opalach <andrew@akon.city>
Date: Sun Feb 2 15:24:33 2025 -0500
WASAPI: Fix drain on device stop
diff --git a/miniaudio.h b/miniaudio.h
index fced0d2..22b0e4f 100644
--- a/miniaudio.h
+++ b/miniaudio.h
@@ -23133,13 +23133,12 @@ static ma_result ma_device_stop__wasapi_nolock(ma_device* pDevice)
*/
if (ma_atomic_bool32_get(&pDevice->wasapi.isStartedPlayback)) {
/* We need to make sure we put a timeout here or else we'll risk getting stuck in a deadlock in some cases. */
- DWORD waitTime = pDevice->wasapi.actualBufferSizeInFramesPlayback / pDevice->playback.internalSampleRate;
+ DWORD waitTime = pDevice->wasapi.actualBufferSizeInFramesPlayback / (pDevice->playback.internalSampleRate / 1000);
if (pDevice->playback.shareMode == ma_share_mode_exclusive) {
WaitForSingleObject((HANDLE)pDevice->wasapi.hEventPlayback, waitTime);
- }
- else {
- ma_uint32 prevFramesAvaialablePlayback = (ma_uint32)-1;
+ } else {
+ ma_uint32 prevFramesAvailablePlayback = (ma_uint32)-1;
ma_uint32 framesAvailablePlayback;
for (;;) {
result = ma_device__get_available_frames__wasapi(pDevice, (ma_IAudioClient*)pDevice->wasapi.pAudioClientPlayback, &framesAvailablePlayback);
@@ -23155,13 +23154,13 @@ static ma_result ma_device_stop__wasapi_nolock(ma_device* pDevice)
Just a safety check to avoid an infinite loop. If this iteration results in a situation where the number of available frames
has not changed, get out of the loop. I don't think this should ever happen, but I think it's nice to have just in case.
*/
- if (framesAvailablePlayback == prevFramesAvaialablePlayback) {
+ if (framesAvailablePlayback == prevFramesAvailablePlayback) {
break;
}
- prevFramesAvaialablePlayback = framesAvailablePlayback;
+ prevFramesAvailablePlayback = framesAvailablePlayback;
- WaitForSingleObject((HANDLE)pDevice->wasapi.hEventPlayback, waitTime * 1000);
ResetEvent((HANDLE)pDevice->wasapi.hEventPlayback); /* Manual reset. */
+ WaitForSingleObject((HANDLE)pDevice->wasapi.hEventPlayback, waitTime);
}
}
}
|