d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the -S flag which produces the -s output without

Browse Source 
mixing field separators.
This commit is contained in:
Matthew N. Dodd 2005-04-13 07:11:54 +00:00
parent b2680e2048
commit a103924701
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=144999
2 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/mixer/mixer.8
View File

@ -36,7 +36,7 @@
.Sh SYNOPSIS .Sh SYNOPSIS
.Nm .Nm
.Op Fl f Ar device .Op Fl f Ar device
.Op Fl s .Op Fl s | Fl S
.Oo .Oo
.Ar dev .Ar dev
.Sm off .Sm off
@ -50,12 +50,12 @@
.Ar ... .Ar ...
.Nm .Nm
.Op Fl f Ar device .Op Fl f Ar device
.Op Fl s .Op Fl s | Fl S
.Cm recsrc .Cm recsrc
.Ar ... .Ar ...
.Nm .Nm
.Op Fl f Ar device .Op Fl f Ar device
.Op Fl s .Op Fl s | Fl S
.Sm off .Sm off
.Bro .Bro
.Cm ^ | + | - | = .Cm ^ | + | - | =
@ -118,6 +118,10 @@ for use as the command-line arguments to a future invocation of
.Nm .Nm
(as above). (as above).
.Pp .Pp
The
.Fl S
flag provides the above output without mixing field separators.
.Pp
To change the recording device you use one of: To change the recording device you use one of:
.Bl -tag -width =rec -offset indent .Bl -tag -width =rec -offset indent
.It Cm ^rec .It Cm ^rec

28
usr.sbin/mixer/mixer.c
View File

@ -33,9 +33,9 @@ usage(int devmask, int recmask)
{ {
int i, n; int i, n;
printf("usage: mixer [-f device] [-s] [dev [+|-][voll[:[+|-]volr]] ...\n" printf("usage: mixer [-f device] [-s | -S] [dev [+|-][voll[:[+|-]volr]] ...\n"
" mixer [-f device] [-s] recsrc ...\n" " mixer [-f device] [-s | -S] recsrc ...\n"
" mixer [-f device] [-s] {^|+|-|=}rec rdev ... \n"); " mixer [-f device] [-s | -S] {^|+|-|=}rec rdev ... \n");
printf(" devices: "); printf(" devices: ");
for (i = 0, n = 0; i < SOUND_MIXER_NRDEVICES; i++) for (i = 0, n = 0; i < SOUND_MIXER_NRDEVICES; i++)
if ((1 << i) & devmask) { if ((1 << i) & devmask) {
@ -89,7 +89,7 @@ main(int argc, char *argv[])
{ {
int foo, bar, baz, dev; int foo, bar, baz, dev;
int devmask = 0, recmask = 0, recsrc = 0, orecsrc; int devmask = 0, recmask = 0, recsrc = 0, orecsrc;
int dusage = 0, drecsrc = 0, shortflag = 0; int dusage = 0, drecsrc = 0, shortflag = 0, Shortflag = 0;
int l = 0, r = 0, t = 0; int l = 0, r = 0, t = 0;
char lstr[5], rstr[5]; char lstr[5], rstr[5];
int n = 0, lrel = 0, rrel = 0; int n = 0, lrel = 0, rrel = 0;
@ -104,7 +104,7 @@ main(int argc, char *argv[])
else if (!strcmp(argv[0], "mixer3")) else if (!strcmp(argv[0], "mixer3"))
name = strdup("/dev/mixer2"); name = strdup("/dev/mixer2");
while ((ch = getopt(argc, argv, "f:s")) != -1) while ((ch = getopt(argc, argv, "f:sS")) != -1)
switch (ch) { switch (ch) {
case 'f': case 'f':
name = strdup(optarg); name = strdup(optarg);
@ -112,6 +112,9 @@ main(int argc, char *argv[])
case 's': case 's':
shortflag = 1; shortflag = 1;
break; break;
case 'S':
Shortflag = 1;
break;
default: default:
dusage = 1; dusage = 1;
} }
@ -137,7 +140,10 @@ main(int argc, char *argv[])
warn("MIXER_READ"); warn("MIXER_READ");
continue; continue;
} }
if (shortflag) if (Shortflag)
printf("%s:%d:%d ", names[foo], bar & 0x7f,
(bar >> 8) & 0x7f);
else if (shortflag)
printf("%s %d:%d ", names[foo], bar & 0x7f, printf("%s %d:%d ", names[foo], bar & 0x7f,
(bar >> 8) & 0x7f); (bar >> 8) & 0x7f);
else else
@ -221,7 +227,10 @@ main(int argc, char *argv[])
argc--; argv++; argc--; argv++;
continue; continue;
} }
if (shortflag) if (Shortflag)
printf("%s:%d:%d ", names[dev], bar & 0x7f,
(bar >> 8) & 0x7f);
else if (shortflag)
printf("%s %d:%d ", names[dev], bar & 0x7f, printf("%s %d:%d ", names[dev], bar & 0x7f,
(bar >> 8) & 0x7f); (bar >> 8) & 0x7f);
else else
@ -253,8 +262,9 @@ main(int argc, char *argv[])
else if (r > 100) else if (r > 100)
r = 100; r = 100;
printf("Setting the mixer %s from %d:%d to %d:%d.\n", if (!Shortflag)
names[dev], bar & 0x7f, (bar >> 8) & 0x7f, l, r); printf("Setting the mixer %s from %d:%d to %d:%d.\n",
names[dev], bar & 0x7f, (bar >> 8) & 0x7f, l, r);
l |= r << 8; l |= r << 8;
if (ioctl(baz, MIXER_WRITE(dev), &l) == -1) if (ioctl(baz, MIXER_WRITE(dev), &l) == -1)