ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dsound: Use AudioClient for position. 

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Maarten Lankhorst 2016-05-12 08:43:34 -05:00 committed by Alexandre Julliard
parent 569ed159b0
commit 95287ac2df
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/dsound/dsound_private.h
View File

@ -75,7 +75,6 @@ struct DirectSoundDevice
DSCAPS drvcaps; DSCAPS drvcaps;
DWORD priolevel, sleeptime; DWORD priolevel, sleeptime;
PWAVEFORMATEX pwfx, primary_pwfx; PWAVEFORMATEX pwfx, primary_pwfx;
UINT playing_offs_bytes, in_mmdev_bytes;
LPBYTE buffer; LPBYTE buffer;
DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; DWORD writelead, buflen, aclen, fraglen, state, playpos, pad;
int nrofbuffers; int nrofbuffers;

35
dlls/dsound/primary.c
View File

@ -480,23 +480,6 @@ HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device)
return DS_OK; return DS_OK;
} }
HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos)
{
TRACE("(%p,%p,%p)\n", device, playpos, writepos);
/* check if playpos was requested */
if (playpos)
*playpos = device->playing_offs_bytes;
/* check if writepos was requested */
if (writepos)
/* the writepos is the first non-queued position */
*writepos = (device->playing_offs_bytes + device->in_mmdev_bytes) % device->buflen;
TRACE("playpos = %d, writepos = %d (%p, time=%d)\n", playpos?*playpos:-1, writepos?*writepos:-1, device, GetTickCount());
return DS_OK;
}
WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex) WAVEFORMATEX *DSOUND_CopyFormat(const WAVEFORMATEX *wfex)
{ {
WAVEFORMATEX *pwfx; WAVEFORMATEX *pwfx;
@ -824,7 +807,9 @@ static ULONG WINAPI PrimaryBufferImpl_Release(IDirectSoundBuffer *iface)
static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *iface, static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *iface,
DWORD *playpos, DWORD *writepos) DWORD *playpos, DWORD *writepos)
{ {
HRESULT hres; HRESULT hres = DS_OK;
UINT32 pad = 0;
UINT32 mixpos;
IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface); IDirectSoundBufferImpl *This = impl_from_IDirectSoundBuffer(iface);
DirectSoundDevice *device = This->device; DirectSoundDevice *device = This->device;
TRACE("(%p,%p,%p)\n", iface, playpos, writepos); TRACE("(%p,%p,%p)\n", iface, playpos, writepos);
@ -832,17 +817,23 @@ static HRESULT WINAPI PrimaryBufferImpl_GetCurrentPosition(IDirectSoundBuffer *i
/* **** */ /* **** */
EnterCriticalSection(&(device->mixlock)); EnterCriticalSection(&(device->mixlock));
hres = DSOUND_PrimaryGetPosition(device, playpos, writepos); if (device->client)
hres = IAudioClient_GetCurrentPadding(device->client, &pad);
if (hres != DS_OK) { if (hres != DS_OK) {
WARN("DSOUND_PrimaryGetPosition failed\n"); WARN("IAudioClient_GetCurrentPadding failed\n");
LeaveCriticalSection(&(device->mixlock)); LeaveCriticalSection(&(device->mixlock));
return hres; return hres;
} }
mixpos = (device->playpos + pad * device->pwfx->nBlockAlign) % device->buflen;
if (playpos)
*playpos = mixpos;
if (writepos) { if (writepos) {
if (device->state != STATE_STOPPED) *writepos = mixpos;
if (device->state != STATE_STOPPED) {
/* apply the documented 10ms lead to writepos */ /* apply the documented 10ms lead to writepos */
*writepos += device->writelead; *writepos += device->writelead;
while (*writepos >= device->buflen) *writepos -= device->buflen; *writepos %= device->buflen;
}
} }
LeaveCriticalSection(&(device->mixlock)); LeaveCriticalSection(&(device->mixlock));