===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/aucat/aucat.1,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- src/usr.bin/aucat/aucat.1	2023/01/10 20:48:34	1.119
+++ src/usr.bin/aucat/aucat.1	2024/03/20 08:42:11	1.120
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aucat.1,v 1.119 2023/01/10 20:48:34 ratchov Exp $
+.\"	$OpenBSD: aucat.1,v 1.120 2024/03/20 08:42:11 ratchov Exp $
 .\"
 .\" Copyright (c) 2006 Alexandre Ratchov <alex@caoua.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: January 10 2023 $
+.Dd $Mdocdate: March 20 2024 $
 .Dt AUCAT 1
 .Os
 .Sh NAME
@@ -24,13 +24,13 @@
 .Nm aucat
 .Op Fl dn
 .Op Fl b Ar size
-.Op Fl c Ar min : Ns Ar max
+.Op Fl c Ar channels
 .Op Fl e Ar enc
 .Op Fl f Ar device
 .Op Fl g Ar position
 .Op Fl h Ar fmt
 .Op Fl i Ar file
-.Op Fl j Ar flag
+.Op Fl m Ar min : Ns Ar max Ns / Ns Ar min : Ns Ar max
 .Op Fl o Ar file
 .Op Fl p Ar position
 .Op Fl q Ar port
@@ -78,11 +78,9 @@
 .It Fl b Ar size
 The buffer size of the audio device in frames.
 Default is 7680.
-.It Fl c Ar min : Ns Ar max
-The range of audio file channel numbers.
-The default is
-.Cm 0:1 ,
-i.e. stereo.
+.It Fl c Ar channels
+The audio file channels count.
+The default is 2, i.e. stereo.
 .It Fl d
 Increase log verbosity.
 .It Fl e Ar enc
@@ -146,21 +144,9 @@
 If the option argument is
 .Sq -
 then standard input will be used.
-.It Fl j Ar flag
-Control whether source channels are joined or expanded if
-they don't match the destination number of channels.
-If the flag is
-.Cm off ,
-then each source channel is routed to a single destination channel,
-possibly discarding channels.
-If the flag is
-.Cm on ,
-then a single source may be sent to multiple destinations
-and multiple sources may be mixed into a single destination.
-For instance, this feature could be used to convert
-a stereo file into a mono file mixing left and right channels together.
-The default is
-.Cm off .
+.It Fl m Ar min : Ns Ar max Ns / Ns Ar min : Ns Ar max
+Map the given range of source channels into the given range of
+destination channels.
 .It Fl n
 Off-line mode.
 Read input files and store the result in the output files,
@@ -198,7 +184,7 @@
 .Pp
 On the command line,
 per-file parameters
-.Pq Fl cehjrv
+.Pq Fl cehmrv
 must precede the file definition
 .Pq Fl io .
 .Pp
@@ -282,13 +268,13 @@
 channels 6 and 7 into another stereo file using a 44.1kHz sampling
 rate for both:
 .Bd -literal -offset indent
-$ aucat -r 44100 -c 2:3 -o file1.wav -c 6:7 -o file2.wav
+$ aucat -r 44100 -m 2:3/0:1 -o file1.wav -m 6:7/0:1 -o file2.wav
 .Ed
 .Pp
 Split a stereo file into two mono files:
 .Bd -literal -offset indent
-$ aucat -n -i stereo.wav -c 0:0 -o left.wav \e
-	-c 1:1 -o right.wav
+$ aucat -n -i stereo.wav -c 1 -m 0:0/0:0 -o left.wav \e
+	-m 1:1/0:0 -o right.wav
 .Ed
 .Sh SEE ALSO
 .Xr cdio 1 ,