summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Ratchov <ratchov@cvs.openbsd.org>2009-04-10 18:51:45 +0000
committerAlexandre Ratchov <ratchov@cvs.openbsd.org>2009-04-10 18:51:45 +0000
commit2d152c27f3b1a0ab189abf8353c05e196498d89e (patch)
tree37d8e4246bc4c594fc66e8e2c3329b8fae6f2dd6
parent3d6412bb61c977bb30c1d7cc7d4af886f92ef254 (diff)
Explain the AUDIODEVICE env. variable similarly to how sio_open(3) does.
discussed with jmc@
-rw-r--r--usr.bin/aucat/aucat.118
-rw-r--r--usr.bin/cdio/cdio.118
2 files changed, 26 insertions, 10 deletions
diff --git a/usr.bin/aucat/aucat.1 b/usr.bin/aucat/aucat.1
index 19fc3e93d68..bfb5517fc8b 100644
--- a/usr.bin/aucat/aucat.1
+++ b/usr.bin/aucat/aucat.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: aucat.1,v 1.49 2009/03/17 21:26:44 jmc Exp $
+.\" $OpenBSD: aucat.1,v 1.50 2009/04/10 18:51:44 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: March 17 2009 $
+.Dd $Mdocdate: April 10 2009 $
.Dt AUCAT 1
.Os
.Sh NAME
@@ -70,9 +70,9 @@ The default is signed, 16-bit, native byte order.
.It Fl f Ar device
The
.Xr audio 4
-device to use for playing and/or recording.
-The default is
-.Pa /dev/audio .
+device or
+.Nm
+socket to use for playing and/or recording.
.It Fl h Ar fmt
File format of the playback or record stream (see below).
The default is auto.
@@ -380,7 +380,13 @@ will exit with an error.
The debug level:
may be a value between 0 and 4.
.It Ev AUDIODEVICE
-The audio device to use.
+Name of the
+.Xr aucat 1
+socket to connect to, or path to the
+.Xr audio 4
+device to use if the
+.Fl f
+option is not specified.
.El
.Sh EXAMPLES
The following will mix and play two stereo streams,
diff --git a/usr.bin/cdio/cdio.1 b/usr.bin/cdio/cdio.1
index 41190ad87a3..48800065447 100644
--- a/usr.bin/cdio/cdio.1
+++ b/usr.bin/cdio/cdio.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cdio.1,v 1.51 2008/06/30 23:35:39 av Exp $
+.\" $OpenBSD: cdio.1,v 1.52 2009/04/10 18:51:44 ratchov Exp $
.\"
.\" Copyright (c) 1995 Serge V. Vakulenko
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate: June 30 2008 $
+.Dd $Mdocdate: April 10 2009 $
.Dt CDIO 1
.Os
.Sh NAME
@@ -100,7 +100,11 @@ Unlike
.Ic play ,
the CD player need not be connected to an audio device;
instead it rips tracks from disk and outputs audio data to
-.Pa /dev/audio .
+the default
+.Xr audio 4
+device or
+.Xr aucat 1
+socket.
Both individual tracks and track ranges may be specified.
If range is specified in descending order tracks will be played in descending order.
If the first value in the range is omitted, tracks from first track on disk to the specified one will be played.
@@ -259,7 +263,7 @@ set stereo mode;
turn the sound off.
.El
.Sh ENVIRONMENT
-.Bl -tag -width "DICSXXX"
+.Bl -tag -width "AUDIODEVICEXXX"
.It Ev DISC , CDROM
Specifies the name of the CD device to use.
If both
@@ -279,6 +283,12 @@ the default is
See also the
.Fl f
option, above.
+.It Ev AUDIODEVICE
+Name of the
+.Xr aucat 1
+socket to connect to, or path to the
+.Xr audio 4
+device to use.
.El
.Sh FILES
.Bl -tag -width /dev/rmcd0c -compact