asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-09 17:15:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixes by Clemens Ladisch <clemens@ladisch.de>:

Browse source 
- fixed the check of wrong variable.
- suppress the "no state is present..." message if the card has
  no controls.
This commit is contained in:
Takashi Iwai 2003-06-20 18:13:28 +00:00
parent 43a2330ab0
commit b24728b015
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
alsactl/alsactl.c
View file

@ -507,7 +507,7 @@ static int get_controls(int cardno, snd_config_t *top)
}
err = snd_config_search(state, id, &card);
if (err == 0 &&
snd_config_get_type(state) != SND_CONFIG_TYPE_COMPOUND) {
snd_config_get_type(card) != SND_CONFIG_TYPE_COMPOUND) {
error("config state.%s node is not a compound", id);
err = -EINVAL;
goto _close;
@ -527,18 +527,22 @@ static int get_controls(int cardno, snd_config_t *top)
goto _close;
}
}
err = snd_config_compound_add(card, "control", 1, &control);
if (err < 0) {
error("snd_config_compound_add: %s", snd_strerror(err));
goto _close;
}
err = snd_ctl_elem_list(handle, list);
if (err < 0) {
error("Cannot determine controls: %s", snd_strerror(err));
goto _close;
}
count = snd_ctl_elem_list_get_count(list);
if (count <= 0) {
if (count < 0) {
err = 0;
goto _close;
}
err = snd_config_compound_add(card, "control", count > 0, &control);
if (err < 0) {
error("snd_config_compound_add: %s", snd_strerror(err));
goto _close;
}
if (count == 0) {
err = 0;
goto _close;
}