dmime: Don't set DSBCAPS_CTRLPAN together with DSBCAPS_CTRL3D.

Troubleshooted by Michael Müller.
Fixes a regression caused by 0e5dcc2c84.

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2016-01-10 23:37:12 +01:00 committed by Alexandre Julliard
parent d8287b5500
commit 5433a2c054
1 changed files with 3 additions and 3 deletions

View File

@ -1035,7 +1035,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire
memset(&desc, 0, sizeof(desc)); memset(&desc, 0, sizeof(desc));
desc.dwSize = sizeof(desc); desc.dwSize = sizeof(desc);
desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLPAN | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS; desc.dwFlags = DSBCAPS_CTRLFX | DSBCAPS_CTRLVOLUME | DSBCAPS_GLOBALFOCUS;
desc.dwBufferBytes = DSBSIZE_MIN; desc.dwBufferBytes = DSBSIZE_MIN;
desc.dwReserved = 0; desc.dwReserved = 0;
desc.lpwfxFormat = &format; desc.lpwfxFormat = &format;
@ -1046,14 +1046,14 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire
desc.dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE; desc.dwFlags |= DSBCAPS_CTRL3D | DSBCAPS_CTRLFREQUENCY | DSBCAPS_MUTE3DATMAXDISTANCE;
break; break;
case DMUS_APATH_DYNAMIC_MONO: case DMUS_APATH_DYNAMIC_MONO:
desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
break; break;
case DMUS_APATH_SHARED_STEREOPLUSREVERB: case DMUS_APATH_SHARED_STEREOPLUSREVERB:
/* normally we have to create 2 buffers (one for music other for reverb) /* normally we have to create 2 buffers (one for music other for reverb)
* in this case. See msdn * in this case. See msdn
*/ */
case DMUS_APATH_DYNAMIC_STEREO: case DMUS_APATH_DYNAMIC_STEREO:
desc.dwFlags |= DSBCAPS_CTRLFREQUENCY; desc.dwFlags |= DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
format.nChannels = 2; format.nChannels = 2;
format.nBlockAlign *= 2; format.nBlockAlign *= 2;
format.nAvgBytesPerSec *=2; format.nAvgBytesPerSec *=2;