---<br> dlls/dsound/primary.c | 22 ----------------------<br> 1 files changed, 0 insertions(+), 22 deletions(-)<br><br>diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c<br>index aa8450f..11eb003 100644<br>--- a/dlls/dsound/primary.c<br>
+++ b/dlls/dsound/primary.c<br>@@ -200,16 +200,6 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)<br> device->prebuf = device->helfrags;<br> }<br> <br>- device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen);<br>
- device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len);<br>- if (!device->mix_buffer)<br>- {<br>- if (device->hwbuf)<br>- IDsDriverBuffer_Release(device->hwbuf);<br>
- device->hwbuf = NULL;<br>- return DSERR_OUTOFMEMORY;<br>- }<br>-<br> if (device->state == STATE_PLAYING) device->state = STATE_STARTING;<br> else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED;<br>
<br>@@ -278,10 +268,7 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)<br> <br> TRACE("fraglen=%d, overshot=%d\n", device->fraglen, overshot);<br> }<br>- device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1];<br>
- device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];<br> FillMemory(device->buffer, device->buflen, (device->pwfx->wBitsPerSample == 8) ? 128 : 0);<br>- FillMemory(device->mix_buffer, device->mix_buffer_len, 0);<br>
device->pwplay = device->pwqueue = device->playpos = device->mixpos = 0;<br> return err;<br> }<br>@@ -581,22 +568,13 @@ static HRESULT DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE<br>
}<br> }<br> <br>- device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen);<br>- device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0, device->mix_buffer, device->mix_buffer_len);<br>
- FillMemory(device->mix_buffer, device->mix_buffer_len, 0);<br>- device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1];<br>- device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];<br>
-<br> if (nSamplesPerSec != device->pwfx->nSamplesPerSec || bpp != device->pwfx->wBitsPerSample || chans != device->pwfx->nChannels) {<br> IDirectSoundBufferImpl** dsb = device->buffers;<br>
for (i = 0; i < device->nrofbuffers; i++, dsb++) {<br> /* **** */<br> RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE);<br> <br>- (*dsb)->freqAdjust = ((DWORD64)(*dsb)->freq << DSOUND_FREQSHIFT) / device->pwfx->nSamplesPerSec;<br>
DSOUND_RecalcFormat((*dsb));<br>- DSOUND_MixToTemporary((*dsb), 0, (*dsb)->buflen, FALSE);<br>- (*dsb)->primary_mixpos = 0;<br> <br> RtlReleaseResource(&(*dsb)->lock);<br>
/* **** */<br>-- <br>1.7.2.3<br><br><br>