Maarten Lankhorst : winealsa: Unset WAVECAPS_DIRECTSOUND properly for capture.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Apr 27 06:44:02 CDT 2007


Module: wine
Branch: master
Commit: b67164d248bebd3277e45c0550f0c5eff1f2ebc4
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b67164d248bebd3277e45c0550f0c5eff1f2ebc4

Author: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date:   Tue Apr 24 20:12:07 2007 +0200

winealsa: Unset WAVECAPS_DIRECTSOUND properly for capture.

---

 dlls/winealsa.drv/waveinit.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c
index 6614c00..11f8fdd 100644
--- a/dlls/winealsa.drv/waveinit.c
+++ b/dlls/winealsa.drv/waveinit.c
@@ -504,12 +504,6 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm
     wwi.incaps.wPid = MM_CREATIVE_SBP16_WAVEOUT;
     wwi.incaps.vDriverVersion = 0x0100;
 
-    if (wwi.ds_caps.dwFlags & WAVECAPS_DIRECTSOUND)
-    {
-        FIXME("Add support for DSCapture\n");
-        wwi.ds_caps.dwFlags &= ~WAVECAPS_DIRECTSOUND;
-    }
-
     rc = ALSA_ComputeCaps(ctl, pcm, &wwi.incaps.wChannels, &wwi.ds_caps.dwFlags,
             &wwi.incaps.dwFormats, &wwi.dwSupport);
     if (rc)
@@ -519,6 +513,12 @@ static int ALSA_AddCaptureDevice(snd_ctl_t *ctl, snd_pcm_t *pcm, const char *pcm
         return(rc);
     }
 
+    if (wwi.dwSupport & WAVECAPS_DIRECTSOUND)
+    {
+        FIXME("Add support for DSCapture\n");
+        wwi.dwSupport &= ~WAVECAPS_DIRECTSOUND;
+    }
+
     rc = ALSA_AddDeviceToArray(&wwi, &WInDev, &ALSA_WidNumDevs, &ALSA_WidNumMallocedDevs, isdefault);
     if (rc)
         ALSA_FreeDevice(&wwi);




More information about the wine-cvs mailing list