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

Some typos. Be relaxed wrt syntax error on store

Browse source
This commit is contained in:
Abramo Bagnara 2000-08-25 16:37:31 +00:00
parent 44ee42e587
commit daa1208d5f
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
alsactl/alsactl.c
View file

@ -342,7 +342,7 @@ static int get_control(snd_ctl_t *handle, snd_control_id_t *id, snd_config_t *to
return 0; return 0;
case SND_CONTROL_TYPE_ENUMERATED: case SND_CONTROL_TYPE_ENUMERATED:
{ {
unsigned int v = ctl.value.integer.value[0]; unsigned int v = ctl.value.enumerated.item[0];
snd_config_t *c; snd_config_t *c;
err = snd_config_search(item, num_str(v), &c); err = snd_config_search(item, num_str(v), &c);
if (err == 0) { if (err == 0) {
@ -389,7 +389,7 @@ static int get_control(snd_ctl_t *handle, snd_control_id_t *id, snd_config_t *to
break; break;
case SND_CONTROL_TYPE_ENUMERATED: case SND_CONTROL_TYPE_ENUMERATED:
for (idx = 0; idx < info.values_count; idx++) { for (idx = 0; idx < info.values_count; idx++) {
unsigned int v = ctl.value.integer.value[idx]; unsigned int v = ctl.value.enumerated.item[idx];
snd_config_t *c; snd_config_t *c;
err = snd_config_search(item, num_str(v), &c); err = snd_config_search(item, num_str(v), &c);
if (err == 0) { if (err == 0) {
@ -399,10 +399,11 @@ static int get_control(snd_ctl_t *handle, snd_control_id_t *id, snd_config_t *to
} else { } else {
err = snd_config_integer_add(value, num_str(idx), v); err = snd_config_integer_add(value, num_str(idx), v);
} }
if (err < 0) if (err < 0) {
error("snd_config add: %s", snd_strerror(err)); error("snd_config add: %s", snd_strerror(err));
return err; return err;
} }
}
break; break;
default: default:
error("Unknown control type: %d\n", info.type); error("Unknown control type: %d\n", info.type);
@ -556,9 +557,9 @@ static int config_bool(snd_config_t *n)
default: default:
return -1; return -1;
} }
if (strcmp(str, "on") || strcmp(str, "true")) if (strcmp(str, "on") == 0 || strcmp(str, "true") == 0)
return 1; return 1;
if (strcmp(str, "off") || strcmp(str, "false")) if (strcmp(str, "off") == 0 || strcmp(str, "false") == 0)
return 0; return 0;
return -1; return -1;
} }
@ -896,10 +897,12 @@ static int save_state(char *file, const char *cardname)
if (fp) { if (fp) {
err = snd_config_load(config, fp); err = snd_config_load(config, fp);
fclose(fp); fclose(fp);
#if 0
if (err < 0) { if (err < 0) {
error("snd_config_load error: %s", snd_strerror(err)); error("snd_config_load error: %s", snd_strerror(err));
return err; return err;
} }
#endif
} }
if (!cardname) { if (!cardname) {