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

Change the behaviour of mixer slightly such that not explicitly specifying

Browse Source 
a mixer device will set/get the master volume levels

PR:		25156
Submitted by:	Tony Finch <dot@dotat.at>
Reviewed by:	cg, nik
This commit is contained in:
George C A Reid 2001-04-09 11:10:34 +00:00
parent 7032578aac
commit 5c7f33e12c
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,9 @@ may be specified. The
.Ar lvol
and
.Ar rvol
arguments may be from 0 - 100.
arguments may be from 0 - 100. Omitting
.Ar dev
and including only the channel settings will change the main volume level.
.Pp
If the
.Fl s

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

@ -90,7 +90,7 @@ main(int argc, char *argv[])
int foo, bar, baz, dev;
int devmask = 0, recmask = 0, recsrc = 0, orecsrc;
int dusage = 0, drecsrc = 0, shortflag = 0;
int l, r;
int l = 0, r = 0, t = 0;
char ch;
char *name;
@ -145,7 +145,7 @@ main(int argc, char *argv[])
argc--; argv++;
while ((argc) && (dusage == 0)) {
while ((argc > 0) && (dusage == 0)) {
if (!strcmp("recsrc", *argv)) {
drecsrc = 1;
argc--; argv++;
@ -181,13 +181,16 @@ main(int argc, char *argv[])
continue;
}
if ((dev = res_name(*argv, devmask)) == -1) {
if ((t = sscanf(*argv, "%d:%d", &l, &r)) > 0) {
dev = 0;
}
else if((dev = res_name(*argv, devmask)) == -1) {
warnx("unknown device: %s", *argv);
dusage = 1;
break;
}
switch(argc > 1 ? sscanf(argv[1], "%d:%d", &l, &r) : 0) {
switch(argc > 1 ? sscanf(argv[1], "%d:%d", &l, &r) : t) {
case 0:
if (ioctl(baz, MIXER_READ(dev),&bar)== -1) {
warn("MIXER_READ");