Andrew Eikum : dsound: Don't set very low limits on HW buffers.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon May 11 07:49:03 CDT 2015
Module: wine
Branch: master
Commit: ff25b25a494aef6d55679dfaefd63d63fe0cf5e8
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff25b25a494aef6d55679dfaefd63d63fe0cf5e8
Author: Andrew Eikum <aeikum at codeweavers.com>
Date: Fri May 8 11:18:12 2015 -0500
dsound: Don't set very low limits on HW buffers.
---
dlls/dsound/dsound.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c
index f77d2ea..7b93455 100644
--- a/dlls/dsound/dsound.c
+++ b/dlls/dsound/dsound.c
@@ -375,8 +375,8 @@ static HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGU
device->drvcaps.dwMinSecondarySampleRate = DSBFREQUENCY_MIN;
device->drvcaps.dwMaxSecondarySampleRate = DSBFREQUENCY_MAX;
device->drvcaps.dwMaxHwMixingAllBuffers = 16;
- device->drvcaps.dwMaxHwMixingStaticBuffers = 1;
- device->drvcaps.dwMaxHwMixingStreamingBuffers = 1;
+ device->drvcaps.dwMaxHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
+ device->drvcaps.dwMaxHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
device->drvcaps.dwFreeHwMixingAllBuffers = device->drvcaps.dwMaxHwMixingAllBuffers;
device->drvcaps.dwFreeHwMixingStaticBuffers = device->drvcaps.dwMaxHwMixingStaticBuffers;
device->drvcaps.dwFreeHwMixingStreamingBuffers = device->drvcaps.dwMaxHwMixingStreamingBuffers;
@@ -814,14 +814,8 @@ static HRESULT WINAPI IDirectSound8Impl_GetCaps(IDirectSound8 *iface, DSCAPS *ds
dscaps->dwMaxHwMixingStaticBuffers = This->device->drvcaps.dwMaxHwMixingStaticBuffers;
dscaps->dwMaxHwMixingStreamingBuffers = This->device->drvcaps.dwMaxHwMixingStreamingBuffers;
dscaps->dwFreeHwMixingAllBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers;
-
- if (This->device->drvcaps.dwFreeHwMixingAllBuffers > 0) {
- dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingStaticBuffers;
- dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingStreamingBuffers;
- } else {
- dscaps->dwFreeHwMixingStaticBuffers = 0;
- dscaps->dwFreeHwMixingStreamingBuffers = 0;
- }
+ dscaps->dwFreeHwMixingStaticBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers;
+ dscaps->dwFreeHwMixingStreamingBuffers = This->device->drvcaps.dwFreeHwMixingAllBuffers;
dscaps->dwMaxHw3DAllBuffers = This->device->drvcaps.dwMaxHw3DAllBuffers;
dscaps->dwMaxHw3DStaticBuffers = This->device->drvcaps.dwMaxHw3DStaticBuffers;
More information about the wine-cvs
mailing list