- rename -s arg name to "socket"

- condense EXAMPLES into a single screenful

ok ratchov

2 files changed, 9 insertions, 39 deletions

diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index b4df726ae53..e68db98d098 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: aucat.1,v 1.39 2008/11/17 07:36:43 jmc Exp $
+.\"	$OpenBSD: aucat.1,v 1.40 2008/11/17 09:40:09 jmc Exp $
 .\"
 .\" Copyright (c) 2006 Alexandre Ratchov <alex@caoua.org>
 .\"
@@ -34,7 +34,7 @@
 .Op Fl m Ar mode
 .Op Fl o Ar file
 .Op Fl r Ar rate
-.Op Fl s Ar file
+.Op Fl s Ar socket
 .Op Fl v Ar volume
 .Op Fl x Ar policy
 .Ek
@@ -110,8 +110,10 @@ then standard output will be used.
 .It Fl r Ar rate
 Sample rate in Hertz of the playback or record stream.
 The default is 44100Hz.
-.It Fl s Ar file
-Add this path to the list of sockets to listen on.
+.It Fl s Ar socket
+Add the path
+.Ar socket
+to the list of sockets to listen on.
 Meaningful in server mode only.
 .It Fl u
 Normally
@@ -330,20 +332,6 @@ may be a value between 0 and 4.
 The audio device to use.
 .El
 .Sh EXAMPLES
-The following command will record a stereo s16le stream at
-44100Hz from the default device.
-If necessary, the stream will be converted and/or resampled
-to match parameters supported by the device:
-.Bd -literal -offset indent
-$ aucat -o file.raw
-.Ed
-.Pp
-The following command will play a stereo s16le stream at
-44100Hz on the default device, doing any necessary conversions:
-.Bd -literal -offset indent
-$ aucat -i file.raw
-.Ed
-.Pp
 The following will mix and play two stereo streams,
 the first at 48kHz and the second at 44.1kHz:
 .Bd -literal -offset indent
@@ -357,27 +345,9 @@ both:
 $ aucat -r 96000 -C 2:3 -o file1.raw -C 6:7 -o file2.raw
 .Ed
 .Pp
-The following will play two s18le mono files, one on each channel:
-.Bd -literal -offset indent
-$ aucat -e s18le -c 0:0 -i f1.raw -c 1:1 -i f2.raw
-.Ed
-.Pp
-The following will mix and play two files and record a third one in
-full-duplex:
-.Bd -literal -offset indent
-$ aucat -i drums.raw -i bass.raw -o guitar.raw
-.Ed
-.Pp
-The following will start
-.Nm
-in server mode with the default parameters:
-.Bd -literal -offset indent
-$ aucat -l
-.Ed
-.Pp
 The following will start
 .Nm
-in server mode with the default parameters, but will create an
+in server mode using default parameters, but will create an
 additional socket for output to channels 2:3 only (rear speakers
 on most cards):
 .Bd -literal -offset indent
diff --git a/usr.bin/aucat/aucat.c b/usr.bin/aucat/aucat.c
index b470a00f199..c5490d72411 100644
--- a/usr.bin/aucat/aucat.c
+++ b/usr.bin/aucat/aucat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aucat.c,v 1.44 2008/11/17 07:36:43 jmc Exp $	*/
+/*	$OpenBSD: aucat.c,v 1.45 2008/11/17 09:40:09 jmc Exp $	*/
 /*
  * Copyright (c) 2008 Alexandre Ratchov <alex@caoua.org>
  *
@@ -113,7 +113,7 @@ usage(void)
 	fprintf(stderr,
 	    "usage: %s [-lu] [-b nsamples] [-C min:max] [-c min:max] [-e enc] "
 	    "[-f device]\n"
-	    "\t[-h fmt] [-i file] [-m mode] [-o file] [-r rate] [-s file]\n"
+	    "\t[-h fmt] [-i file] [-m mode] [-o file] [-r rate] [-s socket]\n"
 	    "\t[-v volume] [-x policy]\n",
 	    __progname);
 }