dsound: Get rid of no longer needed mix_buffer_len field.

This was missing in 09890d71. Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Andrew Eikum <aeikum@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dsound: Get rid of no longer needed mix_buffer_len field.
65bab6a5 · Sebastian Lackner · Alexandre Julliard · 01e722a4 · 65bab6a5 · 65bab6a5
Commit 65bab6a5 authored May 15, 2016 by Sebastian Lackner Committed by Alexandre Julliard May 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

dsound_private.h dlls/dsound/dsound_private.h +1 -1

primary.c dlls/dsound/primary.c +1 -4

No files found.
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -88,7 +88,7 @@ struct DirectSoundDevice
    int                         num_speakers;
    int                         lfe_channel;
    float *tmp_buffer;
-    DWORD                       tmp_buffer_len, mix_buffer_len;
+    DWORD                       tmp_buffer_len;
    DSVOLUMEPAN                 volpan;

--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -338,8 +338,6 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
 		device->buflen = ds_hel_buflen;
 	device->buflen -= device->buflen % device->pwfx->nBlockAlign;
-	device->mix_buffer_len = (device->buflen / (device->pwfx->wBitsPerSample / 8)) * sizeof(float);
 	if (device->state == STATE_PLAYING) device->state = STATE_STARTING;
 	else if (device->state == STATE_STOPPING) device->state = STATE_STOPPED;
@@ -359,8 +357,7 @@ HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device)
    device->buffer = newbuf;
-    TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n",
+    TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen);
-            device->buflen, device->fraglen, device->mix_buffer_len);
    if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT ||
            (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&