diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-12-30 04:23:08 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-12-30 04:23:08 +0000 |
| commit | 0426bfe1157c109f9637629442711a01c0f0f018 (patch) | |
| tree | 3923686f22ec44c9548b44c0348d83eb42d6ba84 /usr.sbin | |
| parent | e4e2a625b850aeca6ca94e32fdf07676c4587c8a (diff) | |
| download | FreeBSD-src-0426bfe1157c109f9637629442711a01c0f0f018.zip FreeBSD-src-0426bfe1157c109f9637629442711a01c0f0f018.tar.gz | |
Print old mixer levels when setting new ones.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/mixer/mixer.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr.sbin/mixer/mixer.c b/usr.sbin/mixer/mixer.c index 68cb40e..d25a84e9ac 100644 --- a/usr.sbin/mixer/mixer.c +++ b/usr.sbin/mixer/mixer.c @@ -217,8 +217,14 @@ main(int argc, char *argv[]) else if (r > 100) r = 100; - printf("Setting the mixer %s to %d:%d.\n", names[dev], - l, r); + if (ioctl(baz, MIXER_READ(dev),&bar)== -1) { + warn("MIXER_READ"); + argc--; argv++; + continue; + } + + printf("Setting the mixer %s from %d:%d to %d:%d.\n", + names[dev], bar & 0x7f, (bar >> 8) & 0x7f, l, r); l |= r << 8; if (ioctl(baz, MIXER_WRITE(dev), &l) == -1) |
