release 1.0.14rc3

Patch-level: Merged
This commit is contained in:
Jaroslav Kysela 2007-02-26 09:21:12 +01:00
parent 98f8b6c9a8
commit afb23f3f58
2 changed files with 4 additions and 2 deletions

View file

@ -9,7 +9,7 @@ dnl add API = c+1:0:a+1
dnl remove API = c+1:0:0 dnl remove API = c+1:0:0
dnl ************************************************* dnl *************************************************
AC_CANONICAL_SYSTEM 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" eval LIBTOOL_VERSION_INFO="2:0:0"
dnl ************************************************* dnl *************************************************
AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}") AM_CONDITIONAL(INSTALL_M4, test -n "${ACLOCAL}")

View file

@ -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) if (snd_config_search(snd_config, "defaults.namehint.showall", &conf) >= 0)
list.show_all = snd_config_get_bool(conf) > 0; list.show_all = snd_config_get_bool(conf) > 0;
if (card >= 0) { if (card >= 0) {
err = add_card(&list, card); err = get_card_name(&list, card);
if (err >= 0)
err = add_card(&list, card);
} else { } else {
err = snd_card_next(&card); err = snd_card_next(&card);
if (err < 0) if (err < 0)