Skip to content

W
wine-winehq
Commit 704e16c3 authored by Robert Reif's avatar Robert Reif Committed by Alexandre Julliard
Browse files
Options

Fixed a bug where freqAdjust was not being updated properly when the

primary buffer format changed.
parent 06b8046f
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/dsound/primary.c
View file @ 704e16c3
...@@ -340,7 +340,8 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat( ...@@ -340,7 +340,8 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat(
ICOM_THIS(PrimaryBufferImpl,iface); ICOM_THIS(PrimaryBufferImpl,iface);
IDirectSoundImpl* dsound = This->dsound; IDirectSoundImpl* dsound = This->dsound;
HRESULT err = DS_OK; HRESULT err = DS_OK;
int i; int i;
DWORD nSamplesPerSec;
TRACE("(%p,%p)\n",This,wfex); TRACE("(%p,%p)\n",This,wfex);
if (This->dsound->priolevel == DSSCL_NORMAL) { if (This->dsound->priolevel == DSSCL_NORMAL) {
...@@ -370,6 +371,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat( ...@@ -370,6 +371,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat(
/* **** */ /* **** */
RtlAcquireResourceExclusive(&(dsound->lock), TRUE); RtlAcquireResourceExclusive(&(dsound->lock), TRUE);
nSamplesPerSec = dsound->wfx.nSamplesPerSec;
dsound->wfx.nSamplesPerSec = wfex->nSamplesPerSec; dsound->wfx.nSamplesPerSec = wfex->nSamplesPerSec;
dsound->wfx.nChannels = wfex->nChannels; dsound->wfx.nChannels = wfex->nChannels;
dsound->wfx.wBitsPerSample = wfex->wBitsPerSample; dsound->wfx.wBitsPerSample = wfex->wBitsPerSample;
...@@ -425,7 +427,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat( ...@@ -425,7 +427,7 @@ static HRESULT WINAPI PrimaryBufferImpl_SetFormat(
} }
DSOUND_RecalcPrimary(dsound); DSOUND_RecalcPrimary(dsound);
if (dsound->wfx.nSamplesPerSec != wfex->nSamplesPerSec) { if (nSamplesPerSec != dsound->wfx.nSamplesPerSec) {
IDirectSoundBufferImpl** dsb = dsound->buffers; IDirectSoundBufferImpl** dsb = dsound->buffers;
for (i = 0; i < dsound->nrofbuffers; i++, dsb++) { for (i = 0; i < dsound->nrofbuffers; i++, dsb++) {
/* **** */ /* **** */
......
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