asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-14 04:55:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Corrections for 'char *card'

Browse source
This commit is contained in:
Jaroslav Kysela 2000-09-18 09:47:01 +00:00
parent e0847b4af8
commit b03e752d96
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
amixer/amixer.c
View file

@ -100,7 +100,7 @@ static int info(void)
} }
snd_ctl_close(handle); snd_ctl_close(handle);
if ((err = snd_mixer_open(&mhandle, card)) < 0) { if ((err = snd_mixer_open(&mhandle, card)) < 0) {
error("Mixer device %i open error: %s", card, snd_strerror(err)); error("Mixer %s open error: %s", card, snd_strerror(err));
return err; return err;
} }
if ((err = snd_mixer_simple_control_list(mhandle, &slist)) < 0) { if ((err = snd_mixer_simple_control_list(mhandle, &slist)) < 0) {
@ -353,7 +353,7 @@ static int show_control(const char *space, snd_ctl_t *handle, snd_control_id_t *
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
info.id = *id; info.id = *id;
if ((err = snd_ctl_cinfo(handle, &info)) < 0) { if ((err = snd_ctl_cinfo(handle, &info)) < 0) {
error("Control %i cinfo error: %s\n", card, snd_strerror(err)); error("Control %s cinfo error: %s\n", card, snd_strerror(err));
return err; return err;
} }
if (level & 2) { if (level & 2) {
@ -370,7 +370,7 @@ static int show_control(const char *space, snd_ctl_t *handle, snd_control_id_t *
for (item = 0; item < info.value.enumerated.items; item++) { for (item = 0; item < info.value.enumerated.items; item++) {
info.value.enumerated.item = item; info.value.enumerated.item = item;
if ((err = snd_ctl_cinfo(handle, &info)) < 0) { if ((err = snd_ctl_cinfo(handle, &info)) < 0) {
error("Control %i cinfo error: %s\n", card, snd_strerror(err)); error("Control %s cinfo error: %s\n", card, snd_strerror(err));
return err; return err;
} }
printf("%s; Item #%u '%s'\n", space, item, info.value.enumerated.name); printf("%s; Item #%u '%s'\n", space, item, info.value.enumerated.name);
@ -384,7 +384,7 @@ static int show_control(const char *space, snd_ctl_t *handle, snd_control_id_t *
memset(&control, 0, sizeof(control)); memset(&control, 0, sizeof(control));
control.id = *id; control.id = *id;
if ((err = snd_ctl_cread(handle, &control)) < 0) { if ((err = snd_ctl_cread(handle, &control)) < 0) {
error("Control %i cread error: %s\n", card, snd_strerror(err)); error("Control %s cread error: %s\n", card, snd_strerror(err));
return err; return err;
} }
printf("%s: values=", space); printf("%s: values=", space);
@ -421,16 +421,16 @@ static int controls(int level)
snd_hcontrol_list_t list; snd_hcontrol_list_t list;
if ((err = snd_ctl_open(&handle, card)) < 0) { if ((err = snd_ctl_open(&handle, card)) < 0) {
error("Control %i open error: %s", card, snd_strerror(err)); error("Control %s open error: %s", card, snd_strerror(err));
return err; return err;
} }
if ((err = snd_ctl_hbuild(handle, NULL)) < 0) { if ((err = snd_ctl_hbuild(handle, NULL)) < 0) {
error("Control %i hbuild error: %s\n", card, snd_strerror(err)); error("Control %s hbuild error: %s\n", card, snd_strerror(err));
return err; return err;
} }
memset(&list, 0, sizeof(list)); memset(&list, 0, sizeof(list));
if ((err = snd_ctl_hlist(handle, &list)) < 0) { if ((err = snd_ctl_hlist(handle, &list)) < 0) {
error("Control %i clist error: %s", card, snd_strerror(err)); error("Control %s clist error: %s", card, snd_strerror(err));
return err; return err;
} }
list.pids = (snd_control_id_t *)malloc(list.controls * sizeof(snd_control_id_t)); list.pids = (snd_control_id_t *)malloc(list.controls * sizeof(snd_control_id_t));
@ -440,7 +440,7 @@ static int controls(int level)
} }
list.controls_request = list.controls; list.controls_request = list.controls;
if ((err = snd_ctl_hlist(handle, &list)) < 0) { if ((err = snd_ctl_hlist(handle, &list)) < 0) {
error("Control %i hlist error: %s", card, snd_strerror(err)); error("Control %s hlist error: %s", card, snd_strerror(err));
return err; return err;
} }
for (idx = 0; idx < list.controls; idx++) { for (idx = 0; idx < list.controls; idx++) {
@ -462,7 +462,7 @@ static int show_simple_control(void *handle, snd_mixer_sid_t *sid, const char *s
bzero(&scontrol, sizeof(scontrol)); bzero(&scontrol, sizeof(scontrol));
scontrol.sid = *sid; scontrol.sid = *sid;
if ((err = snd_mixer_simple_control_read(handle, &scontrol)) < 0) { if ((err = snd_mixer_simple_control_read(handle, &scontrol)) < 0) {
error("Mixer %i simple_control error: %s", card, snd_strerror(err)); error("Mixer %s simple_control error: %s", card, snd_strerror(err));
return err; return err;
} }
if ((level & 1) != 0 && scontrol.channels) { if ((level & 1) != 0 && scontrol.channels) {
@ -525,12 +525,12 @@ static int simple_controls(int level)
char name[simple_name_size]; char name[simple_name_size];
if ((err = snd_mixer_open(&handle, card)) < 0) { if ((err = snd_mixer_open(&handle, card)) < 0) {
error("Mixer %i open error: %s", card, snd_strerror(err)); error("Mixer %s open error: %s", card, snd_strerror(err));
return err; return err;
} }
memset(&list, 0, sizeof(list)); memset(&list, 0, sizeof(list));
if ((err = snd_mixer_simple_control_list(handle, &list)) < 0) { if ((err = snd_mixer_simple_control_list(handle, &list)) < 0) {
error("Mixer %i simple_control_list error: %s", card, snd_strerror(err)); error("Mixer %s simple_control_list error: %s", card, snd_strerror(err));
return err; return err;
} }
list.pids = (snd_mixer_sid_t *)malloc(list.controls * sizeof(snd_mixer_sid_t)); list.pids = (snd_mixer_sid_t *)malloc(list.controls * sizeof(snd_mixer_sid_t));
@ -540,7 +540,7 @@ static int simple_controls(int level)
} }
list.controls_request = list.controls; list.controls_request = list.controls;
if ((err = snd_mixer_simple_control_list(handle, &list)) < 0) { if ((err = snd_mixer_simple_control_list(handle, &list)) < 0) {
error("Mixer %i simple_control_list (2) error: %s", card, snd_strerror(err)); error("Mixer %s simple_control_list (2) error: %s", card, snd_strerror(err));
return err; return err;
} }
for (idx = 0; idx < list.controls_count; idx++) { for (idx = 0; idx < list.controls_count; idx++) {
@ -708,7 +708,7 @@ static int cset(int argc, char *argv[], int roflag)
printf("\n"); printf("\n");
} }
if ((err = snd_ctl_open(&handle, card)) < 0) { if ((err = snd_ctl_open(&handle, card)) < 0) {
error("Control %i open error: %s\n", card, snd_strerror(err)); error("Control %s open error: %s\n", card, snd_strerror(err));
return err; return err;
} }
memset(&info, 0, sizeof(info)); memset(&info, 0, sizeof(info));
@ -716,7 +716,7 @@ static int cset(int argc, char *argv[], int roflag)
info.id = id; info.id = id;
control.id = id; control.id = id;
if ((err = snd_ctl_cinfo(handle, &info)) < 0) { if ((err = snd_ctl_cinfo(handle, &info)) < 0) {
error("Control %i cinfo error: %s\n", card, snd_strerror(err)); error("Control %s cinfo error: %s\n", card, snd_strerror(err));
return err; return err;
} }
if (!roflag) { if (!roflag) {
@ -761,7 +761,7 @@ static int cset(int argc, char *argv[], int roflag)
ptr++; ptr++;
} }
if ((err = snd_ctl_cwrite(handle, &control)) < 0) { if ((err = snd_ctl_cwrite(handle, &control)) < 0) {
error("Control %i cwrite error: %s\n", card, snd_strerror(err)); error("Control %s cwrite error: %s\n", card, snd_strerror(err));
return err; return err;
} }
} }
@ -823,7 +823,7 @@ static int sset(int argc, char *argv[], int roflag)
return 1; return 1;
} }
if ((err = snd_mixer_open(&handle, card)) < 0) { if ((err = snd_mixer_open(&handle, card)) < 0) {
error("Mixer %i open error: %s\n", card, snd_strerror(err)); error("Mixer %s open error: %s\n", card, snd_strerror(err));
return err; return err;
} }
memset(&control, 0, sizeof(control)); memset(&control, 0, sizeof(control));
@ -938,19 +938,19 @@ static int events(int argc, char *argv[])
int err; int err;
if ((err = snd_ctl_open(&handle, card)) < 0) { if ((err = snd_ctl_open(&handle, card)) < 0) {
error("Control %i open error: %s\n", card, snd_strerror(err)); error("Control %s open error: %s\n", card, snd_strerror(err));
return err; return err;
} }
if ((err = snd_ctl_hbuild(handle, NULL)) < 0) { if ((err = snd_ctl_hbuild(handle, NULL)) < 0) {
error("Control %u hbuild error: %s\n", card, snd_strerror(err)); error("Control %s hbuild error: %s\n", card, snd_strerror(err));
return err; return err;
} }
if ((err = snd_ctl_hcallback_rebuild(handle, events_rebuild, (void *)1)) < 0) { if ((err = snd_ctl_hcallback_rebuild(handle, events_rebuild, (void *)1)) < 0) {
error("Control %u hcallback_rebuild error: %s\n", card, snd_strerror(err)); error("Control %s hcallback_rebuild error: %s\n", card, snd_strerror(err));
return err; return err;
} }
if ((err = snd_ctl_hcallback_add(handle, events_add, (void *)2)) < 0) { if ((err = snd_ctl_hcallback_add(handle, events_add, (void *)2)) < 0) {
error("Control %u hcallback_add error: %s\n", card, snd_strerror(err)); error("Control %s hcallback_add error: %s\n", card, snd_strerror(err));
return err; return err;
} }
for (hcontrol = snd_ctl_hfirst(handle); hcontrol; hcontrol = snd_ctl_hnext(handle, hcontrol)) { for (hcontrol = snd_ctl_hfirst(handle); hcontrol; hcontrol = snd_ctl_hnext(handle, hcontrol)) {
@ -1023,7 +1023,7 @@ static int sevents(int argc, char *argv[])
int err; int err;
if ((err = snd_mixer_open(&handle, card)) < 0) { if ((err = snd_mixer_open(&handle, card)) < 0) {
error("Mixer %i open error: %s\n", card, snd_strerror(err)); error("Mixer %s open error: %s\n", card, snd_strerror(err));
return err; return err;
} }
printf("Ready to listen...\n"); printf("Ready to listen...\n");