From: jmc Date: Mon, 30 Jul 2018 17:24:24 +0000 (+0000) Subject: catch up with the symlink removal of /dev/{audio,mixer}; X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fa26a68ad3d7c51ac23f270bc7050dca41886b21;p=openbsd catch up with the symlink removal of /dev/{audio,mixer}; ok ratchov --- diff --git a/share/man/man4/audio.4 b/share/man/man4/audio.4 index fcb8675eeee..ff33627f1fc 100644 --- a/share/man/man4/audio.4 +++ b/share/man/man4/audio.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: audio.4,v 1.78 2018/07/22 19:11:44 schwarze Exp $ +.\" $OpenBSD: audio.4,v 1.79 2018/07/30 17:24:24 jmc Exp $ .\" $NetBSD: audio.4,v 1.20 1998/05/28 17:27:15 augustss Exp $ .\" .\" Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -28,11 +28,12 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: July 22 2018 $ +.Dd $Mdocdate: July 30 2018 $ .Dt AUDIO 4 .Os .Sh NAME .Nm audio , +.Nm audioctl , .Nm mixer .Nd device-independent audio driver layer .Sh SYNOPSIS @@ -76,35 +77,27 @@ variable. This is the default. .El .Pp -There are three device files available for audio operation: -.Pa /dev/audio , -.Pa /dev/audioctl , +There are three types of device files available for audio operation: +.Pa /dev/audio Ns Ar N , +.Pa /dev/audioctl Ns Ar N , and -.Pa /dev/mixer . -.Pa /dev/audio -is used for recording or playback of digital samples. -.Pa /dev/mixer -is used to manipulate volume, recording source, or other audio mixer +.Pa /dev/mixer Ns Ar N . +Audio devices are used for recording or playback of digital samples. +Mixer devices are used to manipulate volume, recording source, or other audio mixer functions. -.Pa /dev/audioctl -accepts the same +Audio control devices accept the same .Xr ioctl 2 -operations as -.Pa /dev/audio , +operations as audio devices, but no other operations. -In contrast to -.Pa /dev/audio , -which has the exclusive open property, -.Pa /dev/audioctl -can be opened at any time and can be used to read the +In contrast to audio devices, +which have the exclusive open property, +audioctl devices can be opened at any time and can be used to read the .Nm audio device variables while it is in use. .Sh SAMPLING DEVICES -When -.Pa /dev/audio -is opened, it attempts to maintain the previous audio sample format and -record/playback mode. -In addition, if it is opened read-only +When audio devices are opened, +they attempt to maintain the previous audio sample format and record/playback mode. +In addition, if one is opened read-only (write-only) the device is set to half-duplex record (play) mode with recording (playing) unpaused. .Pp @@ -319,17 +312,13 @@ If set, indicates that the device is playing and/or recording. .El .El .Sh MIXER DEVICE -The -.Nm mixer -device, -.Pa /dev/mixer , -may be manipulated with +Mixer devices may be manipulated with .Xr ioctl 2 -but does not support +but do not support .Xr read 2 or .Xr write 2 . -It supports the following +They support the following .Xr ioctl 2 commands: .Pp @@ -527,9 +516,9 @@ mixer controls because they use a name from one of the string values. .Sh FILES .Bl -tag -width /dev/audioctl -compact -.It Pa /dev/audio -.It Pa /dev/audioctl -.It Pa /dev/mixer +.It Pa /dev/audio Ns Ar N +.It Pa /dev/audioctl Ns Ar N +.It Pa /dev/mixer Ns Ar N .El .Sh SEE ALSO .Xr aucat 1 , diff --git a/share/man/man5/mixerctl.conf.5 b/share/man/man5/mixerctl.conf.5 index 4a83e40c635..06d8ce55062 100644 --- a/share/man/man5/mixerctl.conf.5 +++ b/share/man/man5/mixerctl.conf.5 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.conf.5,v 1.6 2015/07/27 17:28:39 sobrado Exp $ +.\" $OpenBSD: mixerctl.conf.5,v 1.7 2018/07/30 17:24:24 jmc Exp $ .\" .\" Copyright (c) 2008 Jason McIntyre .\" @@ -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: July 27 2015 $ +.Dd $Mdocdate: July 30 2018 $ .Dt MIXERCTL.CONF 5 .Os .Sh NAME @@ -135,7 +135,7 @@ The file can then be played back to determine quality. .Dl $ aucat -o test.wav .Sh FILES .Bl -tag -width "/etc/mixerctl.confXXX" -compact -.It Pa /dev/mixer +.It Pa /dev/mixer0 Default audio mixing device. .It Pa /etc/mixerctl.conf .Xr mixerctl 1 diff --git a/usr.bin/mixerctl/mixerctl.1 b/usr.bin/mixerctl/mixerctl.1 index 3206628cdf7..14b78a69a37 100644 --- a/usr.bin/mixerctl/mixerctl.1 +++ b/usr.bin/mixerctl/mixerctl.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mixerctl.1,v 1.34 2015/09/25 14:27:26 schwarze Exp $ +.\" $OpenBSD: mixerctl.1,v 1.35 2018/07/30 17:24:25 jmc Exp $ .\" $NetBSD: mixerctl.1,v 1.8 1998/05/09 12:41:16 augustss Exp $ .\" .\" Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd $Mdocdate: September 25 2015 $ +.Dd $Mdocdate: July 30 2018 $ .Dt MIXERCTL 1 .Os .Sh NAME @@ -68,7 +68,7 @@ This is the default, if no parameters are given to .It Fl f Ar file Specify an alternative audio mixing device. The default is -.Pa /dev/mixer . +.Pa /dev/mixer0 . .It Fl n Suppress printing of the variable name. .It Fl q @@ -153,7 +153,7 @@ The audio mixer device to use. .El .Sh FILES .Bl -tag -width "/etc/mixerctl.confXXX" -compact -.It Pa /dev/mixer +.It Pa /dev/mixer0 Default mixer audio device. .It Pa /etc/mixerctl.conf .Nm