Maarten Lankhorst : winealsa: Don't use default: XX to open up a hardware control.

[Alexandre Julliard]

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

Author: Maarten Lankhorst <maarten(a)codeweavers.com>
Date:   Tue Oct 16 18:32:29 2007 +0200

winealsa: Don't use default:XX to open up a hardware control.

---

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

diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c
index dae6ab4..86143b6 100644
--- a/dlls/winealsa.drv/waveinit.c
+++ b/dlls/winealsa.drv/waveinit.c
@@ -697,15 +697,10 @@ static int ALSA_ScanDevices(int directhw,
         ** Try to open a ctl handle; Wine doesn't absolutely require one,
         **  but it does allow for volume control and for device scanning
         **------------------------------------------------------------------*/
-        sprintf(ctlname, "default:%d", fixedctlcard == -1 ? card : fixedctlcard);
+        sprintf(ctlname, "hw:%d", fixedctlcard == -1 ? card : fixedctlcard);
         rc = snd_ctl_open(&ctl, ctlname, SND_CTL_NONBLOCK);
         if (rc < 0)
         {
-            sprintf(ctlname, "hw:%d", fixedctlcard == -1 ? card : fixedctlcard);
-            rc = snd_ctl_open(&ctl, ctlname, SND_CTL_NONBLOCK);
-        }
-        if (rc < 0)
-        {
             ctl = NULL;
             WARN("Unable to open an alsa ctl for [%s] (pcm card %d): %s; not scanning devices\n",
                     ctlname, card, snd_strerror(rc));