added -c option for easier user. this is equivalent with -Dhw:#

This commit is contained in:
Takashi Iwai 2002-01-08 17:22:23 +00:00
parent 295539577d
commit 9800bec72a
2 changed files with 19 additions and 5 deletions

View file

@ -4,7 +4,7 @@ envy24control \- GUI control tool for Envy24 (ice1712) based
soundcards, under ALSA. soundcards, under ALSA.
.SH SYNOPSIS .SH SYNOPSIS
\fBenvy24control\fP [\fI-D\fP control-name] \fBenvy24control\fP [\fI-c\fP card-number] [\fI-D\fP control-name]
.SH DESCRIPTION .SH DESCRIPTION
\fBenvy24control\fP allows control of the digital mixer, channel gains \fBenvy24control\fP allows control of the digital mixer, channel gains
@ -14,12 +14,16 @@ displays a level meter for each input and output channel.
.SH INVOKING .SH INVOKING
\fBenvy24control\fP [\fI-D\fP control-name] \fBenvy24control\fP [\fI-c\fP card-number] [\fI-D\fP control-name]
.TP .TP
If no control-name is given, then the first sound card is used. If no control-name is given, then the first sound card is used.
.SS Options .SS Options
.TP .TP
\fI-c\fP card-number
Use the card specified by card-number rather than the first card.
This is equivalent with \fI-Dhw:n\fP option where \fIn\fP is the card number.
.TP
\fI-D\fP control-name \fI-D\fP control-name
Use the card specified by control-name rather than the first card, Use the card specified by control-name rather than the first card,
normally this will be of the form hw:\fIn\fP where \fIn\fP is the sound normally this will be of the form hw:\fIn\fP where \fIn\fP is the sound

View file

@ -1144,13 +1144,13 @@ static void create_analog_volume(GtkWidget *main, GtkWidget *notebook, int page)
static void usage(void) static void usage(void)
{ {
fprintf(stderr, "usage: envy24control [-D control-name]\n"); fprintf(stderr, "usage: envy24control [-c card#] [-D control-name]\n");
} }
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
GtkWidget *notebook; GtkWidget *notebook;
char *name, title[128]; char *name, tmpname[8], title[128];
int i, c, err; int i, c, err;
snd_ctl_card_info_t *hw_info; snd_ctl_card_info_t *hw_info;
snd_ctl_elem_value_t *val; snd_ctl_elem_value_t *val;
@ -1159,6 +1159,7 @@ int main(int argc, char **argv)
int page; int page;
static struct option long_options[] = { static struct option long_options[] = {
{"device", 1, 0, 'D'}, {"device", 1, 0, 'D'},
{"card", 1, 0, 'c'},
}; };
snd_ctl_card_info_alloca(&hw_info); snd_ctl_card_info_alloca(&hw_info);
@ -1168,8 +1169,17 @@ int main(int argc, char **argv)
gtk_init(&argc, &argv); gtk_init(&argc, &argv);
name = "hw:0"; name = "hw:0";
while ((c = getopt_long(argc, argv, "D:", long_options, NULL)) != -1) { while ((c = getopt_long(argc, argv, "D:c:", long_options, NULL)) != -1) {
switch (c) { switch (c) {
case 'c':
i = atoi(optarg);
if (i < 0 || i >= 8) {
fprintf(stderr, "envy24control: invalid card number %d\n", i);
exit(1);
}
sprintf(tmpname, "hw:%d", i);
name = tmpname;
break;
case 'D': case 'D':
name = optarg; name = optarg;
break; break;