Skip to content

W
wine-cw
Commit a335f68b authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Alexandre Julliard
Browse files
Options

dsound: Fix locking in mixer.

parent 8aaeb0d4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
dlls/dsound/mixer.c
View file @ a335f68b
...@@ -891,7 +891,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ...@@ -891,7 +891,7 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
} }
if (lock) if (lock)
IDsDriverBuffer_Lock(device->hwbuf, &buf1, &size1, &buf2, &size2, device->mixpos, maxq, 0); IDsDriverBuffer_Lock(device->hwbuf, &buf1, &size1, &buf2, &size2, writepos, maxq, 0);
/* do the mixing */ /* do the mixing */
frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped); frag = DSOUND_MixToPrimary(device, writepos, maxq, recover, &all_stopped);
...@@ -960,9 +960,11 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) ...@@ -960,9 +960,11 @@ static void DSOUND_PerformMix(DirectSoundDevice *device)
} else { } else {
/* update the wave queue if using wave system */ /* update the wave queue if using wave system */
if(device->hwbuf == NULL){ if(device->hwbuf == NULL)
DSOUND_WaveQueue(device, TRUE); DSOUND_WaveQueue(device, TRUE);
} else
/* Keep alsa happy, which needs GetPosition called once every 10 ms */
IDsDriverBuffer_GetPosition(device->hwbuf, NULL, NULL);
/* in the DSSCL_WRITEPRIMARY mode, the app is totally in charge... */ /* in the DSSCL_WRITEPRIMARY mode, the app is totally in charge... */
if (device->state == STATE_STARTING) { if (device->state == STATE_STARTING) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment