[PATCH 07/13] dsound: New resampler--removed some obsolete/conflicting code. (resend)

Krzysztof Nikiel knik00 at gmail.com
Fri Feb 11 05:43:47 CST 2011


---
 dlls/dsound/primary.c |   22 ----------------------
 1 files changed, 0 insertions(+), 22 deletions(-)

diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index aa8450f..11eb003 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -200,16 +200,6 @@ static HRESULT
DSOUND_PrimaryOpen(DirectSoundDevice *device)
 			device->prebuf = device->helfrags;
 	}

-	device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen);
-	device->mix_buffer = HeapAlloc(GetProcessHeap(), 0, device->mix_buffer_len);
-	if (!device->mix_buffer)
-	{
-		if (device->hwbuf)
-			IDsDriverBuffer_Release(device->hwbuf);
-		device->hwbuf = NULL;
-		return DSERR_OUTOFMEMORY;
-	}
-
 	if (device->state == STATE_PLAYING) device->state = STATE_STARTING;
 	else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED;

@@ -278,10 +268,7 @@ static HRESULT
DSOUND_PrimaryOpen(DirectSoundDevice *device)

 		TRACE("fraglen=%d, overshot=%d\n", device->fraglen, overshot);
 	}
-	device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1];
-	device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];
 	FillMemory(device->buffer, device->buflen,
(device->pwfx->wBitsPerSample == 8) ? 128 : 0);
-	FillMemory(device->mix_buffer, device->mix_buffer_len, 0);
 	device->pwplay = device->pwqueue = device->playpos = device->mixpos = 0;
 	return err;
 }
@@ -581,22 +568,13 @@ static HRESULT
DSOUND_PrimarySetFormat(DirectSoundDevice *device, LPCWAVEFORMATE
 		}
 	}

-	device->mix_buffer_len = DSOUND_bufpos_to_mixpos(device, device->buflen);
-	device->mix_buffer = HeapReAlloc(GetProcessHeap(), 0,
device->mix_buffer, device->mix_buffer_len);
-	FillMemory(device->mix_buffer, device->mix_buffer_len, 0);
-	device->mixfunction = mixfunctions[device->pwfx->wBitsPerSample/8 - 1];
-	device->normfunction = normfunctions[device->pwfx->wBitsPerSample/8 - 1];
-
 	if (nSamplesPerSec != device->pwfx->nSamplesPerSec || bpp !=
device->pwfx->wBitsPerSample || chans != device->pwfx->nChannels) {
 		IDirectSoundBufferImpl** dsb = device->buffers;
 		for (i = 0; i < device->nrofbuffers; i++, dsb++) {
 			/* **** */
 			RtlAcquireResourceExclusive(&(*dsb)->lock, TRUE);

-			(*dsb)->freqAdjust = ((DWORD64)(*dsb)->freq << DSOUND_FREQSHIFT) /
device->pwfx->nSamplesPerSec;
 			DSOUND_RecalcFormat((*dsb));
-			DSOUND_MixToTemporary((*dsb), 0, (*dsb)->buflen, FALSE);
-			(*dsb)->primary_mixpos = 0;

 			RtlReleaseResource(&(*dsb)->lock);
 			/* **** */
-- 
1.7.2.3



More information about the wine-patches mailing list