Module: wine Branch: master Commit: cdbd17bdb85a80d62acec036a0314e7343e30d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdbd17bdb85a80d62acec036a0...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Tue Aug 7 11:00:17 2007 +0200
dsound: Make hardware acceleration work again.
---
dlls/dsound/capture.c | 3 +-- dlls/dsound/dsound.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 2ee27ae..833c039 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1584,7 +1584,7 @@ HRESULT DirectSoundCaptureDevice_Initialize(
/* Disable the direct sound driver to force emulation if requested. */ device->driver = NULL; - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) { err = mmErr(waveInMessage((HWAVEIN)wid,DRV_QUERYDSOUNDIFACE,(DWORD_PTR)&(device->driver),0)); if ( (err != DS_OK) && (err != DSERR_UNSUPPORTED) ) { @@ -1594,7 +1594,6 @@ HRESULT DirectSoundCaptureDevice_Initialize( } err = DS_OK;
- /* Get driver description */ if (device->driver) { TRACE("using DirectSound driver\n"); diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index cc693cb..0cb66ca 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1414,7 +1414,7 @@ HRESULT DirectSoundDevice_Initialize(DirectSoundDevice ** ppDevice, LPCGUID lpcG device->driver = NULL;
/* DRV_QUERYDSOUNDIFACE is a "Wine extension" to get the DSound interface */ - if (ds_hw_accel > DS_HW_ACCEL_EMULATION) + if (ds_hw_accel != DS_HW_ACCEL_EMULATION) waveOutMessage((HWAVEOUT)wod, DRV_QUERYDSOUNDIFACE, (DWORD_PTR)&device->driver, 0);
/* Get driver description */