Module Name: src
Committed By: wiz
Date: Wed Dec 29 18:46:49 UTC 2010
Modified Files:
src/usr.bin/audio/play: audioplay.1
src/usr.bin/audio/record: audiorecord.1
Log Message:
Sort some more.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/audio/play/audioplay.1
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/audio/record/audiorecord.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audio/play/audioplay.1
diff -u src/usr.bin/audio/play/audioplay.1:1.22 src/usr.bin/audio/play/audioplay.1:1.23
--- src/usr.bin/audio/play/audioplay.1:1.22 Wed Dec 29 13:09:03 2010
+++ src/usr.bin/audio/play/audioplay.1 Wed Dec 29 18:46:48 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: audioplay.1,v 1.22 2010/12/29 13:09:03 mrg Exp $
+.\" $NetBSD: audioplay.1,v 1.23 2010/12/29 18:46:48 wiz Exp $
.\"
.\" Copyright (c) 1998, 1999, 2002, 2010 Matthew R. Green
.\" All rights reserved.
@@ -33,8 +33,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl hiqV
-.Op Fl b Ar balance
.Op Fl B Ar buffersize
+.Op Fl b Ar balance
.Op Fl d Ar device
.Op Fl p Ar port
.Op Fl v Ar volume
@@ -59,52 +59,23 @@
.Sh OPTIONS
The following options are available:
.Bl -tag -width 123456
-.It Fl b
-Set the balance to
-.Ar balance .
-This value must be between 0 and 63.
.It Fl B
Set the write block size to
.Ar buffersize .
The default value is the play.buffer_size of the audio device.
+.It Fl b
+Set the balance to
+.Ar balance .
+This value must be between 0 and 63.
+.It Fl c
+When combined with the
+.Fl f
+option, sets the number of channels to its argument.
.It Fl d
Set the audio device to be
.Ar device .
The default is
.Pa /dev/sound .
-.It Fl h
-Print a help message.
-.It Fl i
-If the audio device cannot be opened, exit now rather than wait for it.
-.It Fl p
-Set the output port to
-.Ar port .
-The valid values of
-.Ar port
-are
-.Dq speaker ,
-.Dq headphone
-and
-.Dq line .
-.It Fl q
-Be quiet.
-.It Fl v
-Set the volume (gain) to
-.Ar volume .
-This value must be between 0 and 255.
-.It Fl V
-Be verbose.
-.It Fl f
-Force playing, even if the format is unknown.
-The
-.Fl f
-flag can be used in addition with the following flags to
-change the number of channels, encoding, precision and
-sample rate.
-.It Fl c
-When combined with the
-.Fl f
-option, sets the number of channels to its argument.
.It Fl e
When combined with the
.Fl f
@@ -131,17 +102,46 @@
.Cm mpeg_l2_packets ,
and
.Cm mpeg_l2_system .
+.It Fl f
+Force playing, even if the format is unknown.
+The
+.Fl f
+flag can be used in addition with the following flags to
+change the number of channels, encoding, precision and
+sample rate.
+.It Fl h
+Print a help message.
+.It Fl i
+If the audio device cannot be opened, exit now rather than wait for it.
.It Fl P
When combined with the
.Fl f
option, sets the precision to its argument.
This value must be either 4, 8, 16, 24 or 32.
+.It Fl p
+Set the output port to
+.Ar port .
+The valid values of
+.Ar port
+are
+.Dq speaker ,
+.Dq headphone
+and
+.Dq line .
+.It Fl q
+Be quiet.
.It Fl s
When combined with the
.Fl f
option, sets the sample rate to its argument.
This value must be a valid value for the audio device or an error will
be returned.
+.It Fl V
+Be verbose.
+.It Fl v
+Set the volume (gain) to
+.Ar volume .
+This value must be between 0 and 255.
.El
.Sh ENVIRONMENT
.Bl -tag -width AUDIOCTLDEVICE
Index: src/usr.bin/audio/record/audiorecord.1
diff -u src/usr.bin/audio/record/audiorecord.1:1.39 src/usr.bin/audio/record/audiorecord.1:1.40
--- src/usr.bin/audio/record/audiorecord.1:1.39 Wed Dec 29 13:09:03 2010
+++ src/usr.bin/audio/record/audiorecord.1 Wed Dec 29 18:46:49 2010
@@ -1,4 +1,4 @@
-.\" $NetBSD: audiorecord.1,v 1.39 2010/12/29 13:09:03 mrg Exp $
+.\" $NetBSD: audiorecord.1,v 1.40 2010/12/29 18:46:49 wiz Exp $
.\"
.\" Copyright (c) 1998, 1999, 2001, 2002, 2010 Matthew R. Green
.\" All rights reserved.
@@ -33,8 +33,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl afhqV
-.Op Fl b Ar balance
.Op Fl B Ar buffersize
+.Op Fl b Ar balance
.Op Fl c Ar channels
.Op Fl d Ar device
.Op Fl e Ar encoding
@@ -70,14 +70,14 @@
.Bl -tag -width XpXprecisionX
.It Fl a
Append to the specified file, rather than overwriting.
-.It Fl b Ar balance
-Set the balance to
-.Ar balance .
-This value must be between 0 and 63.
.It Fl B Ar buffersize
Set the audio device read buffer size to
.Ar buffersize .
The default value is the record.buffer_size of the audio device.
+.It Fl b Ar balance
+Set the balance to
+.Ar balance .
+This value must be between 0 and 63.
.It Fl c Ar channels
Set number of channels to
.Ar channels .
@@ -89,7 +89,7 @@
.It Fl e Ar encoding
Set encoding to either
.Dq alaw ,
-.Dq ulaw
+.Dq ulaw ,
or
.Dq linear ,
or any other value reported by
