alsactl: indirect removal; amixer - fixed typos

diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
index 0e210817173610572a32c78da05523811ca669c5..87296de3b94636f9be52ec90864393353bbb0580 100644 (file)
--- a/alsactl/alsactl.c
+++ b/alsactl/alsactl.c
@@ -218,8 +218,8 @@ static int get_control(snd_ctl_t *handle, snd_ctl_elem_id_t *id, snd_config_t *t
                strcat(buf, " volatile");
        if (snd_ctl_elem_info_is_locked(info))
                strcat(buf, " locked");
-       if (snd_ctl_elem_info_is_indirect(info))
-               strcat(buf, " indirect");
+       if (snd_ctl_elem_info_is_first(info))
+               strcat(buf, " first");
        err = snd_config_string_add(comment, "access", buf + 1);
        if (err < 0) {
                error("snd_config_string_add: %s", snd_strerror(err));

diff --git a/amixer/amixer.c b/amixer/amixer.c
index 0fe6d88552c2a3b579b25f42519f7c3ac0aefeda..76cca8d871703755ef6ff898d3d1b8ce8d2a8f2a 100644 (file)
--- a/amixer/amixer.c
+++ b/amixer/amixer.c
@@ -92,12 +92,12 @@ static int info(void)
        snd_ctl_elem_list_alloca(&clist);
        
        if ((err = snd_ctl_open(&handle, card, 0)) < 0) {
-               error("Control device %i open error: %s", card, snd_strerror(err));
+               error("Control device %s open error: %s", card, snd_strerror(err));
                return err;
        }
        
        if ((err = snd_ctl_card_info(handle, info)) < 0) {
-               error("Control device %i hw info error: %s", card, snd_strerror(err));
+               error("Control device %s hw info error: %s", card, snd_strerror(err));
                return err;
        }
        printf("Card %s '%s'/'%s'\n", card, snd_ctl_card_info_get_id(info),