summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2007-02-26 09:21:12 +0100
committerJaroslav Kysela <perex@perex.cz>2007-02-26 09:21:12 +0100
commitafb23f3f58b66f3dfdcd3921b5fa89ec6fda2eda (patch)
tree4671e9d0b8ecabb23f5466463fdc76a57bcdcd32
parent98f8b6c9a8663f7ff857bbdb594c3041a7b928e0 (diff)
downloadalsa-lib-1.0.14rc3.tar.gz
release 1.0.14rc3v1.0.14rc3
Patch-level: Merged
-rw-r--r--configure.in2
-rw-r--r--src/control/namehint.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 3b677d2d..e4e8d0b3 100644
--- a/configure.in
+++ b/configure.in
@@ -9,7 +9,7 @@ dnl add API = c+1:0:a+1
dnl remove API = c+1:0:0
dnl *************************************************
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(alsa-lib, 1.0.14rc2)
+AM_INIT_AUTOMAKE(alsa-lib, 1.0.14rc3)
eval LIBTOOL_VERSION_INFO="2:0:0"
dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")
diff --git a/src/control/namehint.c b/src/control/namehint.c
index 7eecc785..41011341 100644
--- a/src/control/namehint.c
+++ b/src/control/namehint.c
@@ -532,7 +532,9 @@ int snd_device_name_hint(int card, const char *iface, void ***hints)
if (snd_config_search(snd_config, "defaults.namehint.showall", &conf) >= 0)
list.show_all = snd_config_get_bool(conf) > 0;
if (card >= 0) {
- err = add_card(&list, card);
+ err = get_card_name(&list, card);
+ if (err >= 0)
+ err = add_card(&list, card);
} else {
err = snd_card_next(&card);
if (err < 0)