diff options
| author | Rob Landley <rob@landley.net> | 2014-12-31 22:38:48 -0600 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2014-12-31 22:38:48 -0600 |
| commit | 88fe31338f02f8d189e5bfb9164e97b5b7e23d62 (patch) | |
| tree | 5e203e26bde9f02eb716d0b8aab8eba8f199ae8b /toys/other | |
| parent | f3e56f4e4ff773de95fa2c9daf979734d826fc33 (diff) | |
| download | toybox-88fe31338f02f8d189e5bfb9164e97b5b7e23d62.tar.gz | |
Fix for mix from Isaac Dunham (who can actually test it). (I tweaked the curly brackets.)
He says:
In the channel selection loop, "if (TT.chan)" had been combined with
a strcmp; the else conditionals were premised on if (TT.chan) alone.
The help text had been only partially updated for a couple option changes.
Diffstat (limited to 'toys/other')
| -rw-r--r-- | toys/other/mix.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/toys/other/mix.c b/toys/other/mix.c index 2b8165e3..845aac1f 100644 --- a/toys/other/mix.c +++ b/toys/other/mix.c @@ -9,13 +9,13 @@ config MIX bool "mix" default y help - usage: mix [-m DEV] [-d CHANNEL] [-l VOL] [-r RIGHT] + usage: mix [-d DEV] [-c CHANNEL] [-l VOL] [-r RIGHT] List OSS sound channels (module snd-mixer-oss), or set volume(s). + -c CHANNEL Set/show volume of CHANNEL (default first channel found) -d DEV Device node (default /dev/mixer) -l VOL Volume level - -c CHANNEL Set/show volume of CHANNEL (default first channel found) -r RIGHT Volume of right stereo channel (with -r, -l sets left volume) */ @@ -41,8 +41,9 @@ void mix_main(void) for (channel = 0; channel < SOUND_MIXER_NRDEVICES; channel++) { if ((1<<channel) & mask) { - if (TT.chan && !strcmp(channels[channel], TT.chan)) break; - else if (toys.optflags & FLAG_l) break; + if (TT.chan) { + if (!strcmp(channels[channel], TT.chan)) break; + } else if (toys.optflags & FLAG_l) break; else printf("%s\n", channels[channel]); } } |