system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

dsound: Get rid of no longer needed mix_buffer_len field.

Browse source 
This was missing in 09890d7142.

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>
This commit is contained in:
Sebastian Lackner 2016-05-15 02:15:52 +02:00 committed by Alexandre Julliard
parent 01e722a4fc
commit 65bab6a5fe
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/dsound/dsound_private.h
View file

@ -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;

5
dlls/dsound/primary.c
View file

@ -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",
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 &&