commit 65bab6a5fe6cab4d810b2c23b62a6a5b320e169b
author Sebastian Lackner <sebastian@fds-team.de> Sun May 15 02:15:52 2016 +0200
committer Alexandre Julliard <julliard@winehq.org> Mon May 16 22:59:11 2016 +0900
tree a0f67034a523ba40352ac639a72b358c39223f51
parent 01e722a4fc5481fb2fdc37324f728892fd05af30

dsound: Get rid of no longer needed mix_buffer_len field.

This was missing in 09890d7142a2c612b025ab9ff60358d036f9999b.

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>

dlls/dsound/dsound_private.h

diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h
index b980453..8bf9c9d 100644
--- a/dlls/dsound/dsound_private.h
+++ b/dlls/dsound/dsound_private.h
@@ -88,7 +88,7 @@
     int                         num_speakers;
     int                         lfe_channel;
     float *tmp_buffer;
-    DWORD                       tmp_buffer_len, mix_buffer_len;
+    DWORD                       tmp_buffer_len;
 
     DSVOLUMEPAN                 volpan;
 

dlls/dsound/primary.c

diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c
index 1925d0c..a5fe039 100644
--- a/dlls/dsound/primary.c
+++ b/dlls/dsound/primary.c
@@ -338,8 +338,6 @@
 		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 @@
 
     device->buffer = newbuf;
 
-    TRACE("buflen: %u, fraglen: %u, mix_buffer_len: %u\n",
-            device->buflen, device->fraglen, device->mix_buffer_len);
+    TRACE("buflen: %u, fraglen: %u\n", device->buflen, device->fraglen);
 
     if(device->pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT ||
             (device->pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE &&