From 1ae9a9d659c0fd0f4c393b9b8f93eb27fd01cdbe Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst Date: Tue, 16 Oct 2007 18:32:29 +0200 Subject: [PATCH] winealsa: Don't use default:XX to open up a hardware control. --- dlls/winealsa.drv/waveinit.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/winealsa.drv/waveinit.c b/dlls/winealsa.drv/waveinit.c index dae6ab45d40..86143b6ff9d 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)); -- 2.11.4.GIT