asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-12-23 08:36:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix for more better error fault handling for sset toggle

Browse source
This commit is contained in:
Jaroslav Kysela 2005-09-22 12:47:02 +00:00
parent 7876ddd70e
commit 414b308e8c
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
amixer/amixer.c
View file

@ -569,7 +569,8 @@ static int show_selem(snd_mixer_t *handle, snd_mixer_selem_id_t *id, const char
} }
printf("\n"); printf("\n");
if (snd_mixer_selem_is_enumerated(elem)) { if (snd_mixer_selem_is_enumerated(elem)) {
int i, items, idx; int i, items;
unsigned int idx;
char itemname[40]; char itemname[40];
items = snd_mixer_selem_get_enum_items(elem); items = snd_mixer_selem_get_enum_items(elem);
printf(" Items:"); printf(" Items:");
@ -1278,6 +1279,7 @@ static int sset(unsigned int argc, char *argv[], int roflag)
simple_skip_word(&ptr, "nocap") || simple_skip_word(&ptr, "norec")) { simple_skip_word(&ptr, "nocap") || simple_skip_word(&ptr, "norec")) {
/* nothing */ /* nothing */
} else { } else {
okflag &= ~1;
} }
} }
if ((dir & 2) && snd_mixer_selem_has_capture_channel(elem, chn)) { if ((dir & 2) && snd_mixer_selem_has_capture_channel(elem, chn)) {
@ -1313,10 +1315,7 @@ static int sset(unsigned int argc, char *argv[], int roflag)
simple_skip_word(&ptr, "unmute") || simple_skip_word(&ptr, "on")) { simple_skip_word(&ptr, "unmute") || simple_skip_word(&ptr, "on")) {
/* nothing */ /* nothing */
} else { } else {
error("Unknown capture setup '%s'..\n", ptr);
okflag &= ~2; okflag &= ~2;
snd_mixer_close(handle);
return err;
} }
} }
if (okflag == 0) { if (okflag == 0) {