commit 8ed5dcfdaf4c6c5a697619fa3a77455ba4c93932
parent 759b48111e330034a86c3a451d9df343f6d62189
Author: Christos Margiolis <christos@margiolis.net>
Date: Fri, 18 Mar 2022 17:05:50 +0200
ran igor(1) and fixed patch breaking issues
Diffstat:
2 files changed, 77 insertions(+), 62 deletions(-)
diff --git a/lib/libmixer/mixer.3 b/lib/libmixer/mixer.3
@@ -175,7 +175,7 @@ Bit mask containing all supported devices for the mixer.
For example, if device 10 is supported, then the 10th bit in the mask will be set.
By default,
.Fn mixer_open
-stores only the supported devices in devs, so it's very unlikely this mask will
+stores only the supported devices in devs, so it is very unlikely this mask will
be needed.
.It Fa mutemask
Bit mask containing all muted devices.
@@ -316,7 +316,7 @@ opens the default mixer (hw.snd.defaul_unit).
The
.Fn mixer_close
function frees resources and closes the mixer device.
-It's a good practice to always call it when the application is done using the mixer.
+It is a good practice to always call it when the application is done using the mixer.
.Ss Manipulating the mixer
The
.Fn mixer_get_dev
@@ -373,7 +373,7 @@ The
and
.Fn mixer_set_dunit
functions get and set the default audio card in the system.
-Although this is not really a mixer feature, it's useful to have instead of \
+Although this is not really a mixer feature, it is useful to have instead of \
having to use the
.Xr sysctl 3
controls.
@@ -401,7 +401,7 @@ function returns the total number of mixer devices in the system.
The
.Fn MIX_ISDEV
macro checks if a device is actually a valid device for a given mixer.
-It's very unlikely that this macro will ever be needed since the library \
+It is very unlikely that this macro will ever be needed since the library \
stores only valid devices by default.
.Pp
The
@@ -419,7 +419,7 @@ macro checks if a device is a recording source.
The
.Fn MIX_VOLNORM
macro normalizes a value to 32-bit floating point number.
-It's used to normalize the volumes read from the OSS API.
+It is used to normalize the volumes read from the OSS API.
.Pp
The
.Fn MIX_VOLDENORM
@@ -439,7 +439,7 @@ function does the same thing as with
.Fn mix_add_ctl
but the caller passes a
.Ft mix_ctl_t *
-structure instead of each field as a seperate argument.
+structure instead of each field as a separate argument.
.Pp
The
.Fn mixer_remove_ctl
diff --git a/usr.sbin/mixer/mixer.8 b/usr.sbin/mixer/mixer.8
@@ -32,7 +32,7 @@
.Op Fl f Ar device
.Op Fl d Ar unit
.Op Fl os
-.Op Ar dev Ns Op . Ns Ar control Ns Op = Ns Ar value
+.Op Ar dev Ns Op Cm \&. Ns Ar control Ns Op Cm \&= Ns Ar value
.Ar ...
.Nm
.Op Fl d Ar unit
@@ -48,7 +48,8 @@ utility is used to set and display soundcard mixer device controls.
The options are as follows:
.Bl -tag -width "-f device"
.It Fl a
-Print the values for all mixer devices available in the system (see FILES).
+Print the values for all mixer devices available in the system
+.Pq see Sx FILES .
.It Fl d Ar unit
Change the default audio card to
.Ar unit .
@@ -58,9 +59,10 @@ To see what unit values are available, look at the number each mixer device has
.It Fl f Ar device
Open
.Ar device
-as the mixer device (see FILES).
+as the mixer device
+.Pq see Sx FILES .
.It Fl h
-Print a help message to stderr.
+Print a help message.
.It Fl o
Print mixer values in a format suitable for use inside scripts.
The mixer's header (name, audio card name, ...) will not be printed.
@@ -70,9 +72,14 @@ Print only the recording source(s) of the mixer device.
.Pp
The list of mixer devices that may be modified are:
.Bd -ragged -offset indent
-vol, bass, treble, synth, pcm, speaker, line, mic, cd, mix,
-pcm2, rec, igain, ogain, line1, line2, line3, dig1, dig2, dig3,
-phin, phout, video, radio, and monitor.
+.Cm vol , bass , treble , synth , pcm , speaker , line , mic , cd , mix ,
+.Cm pcm2 , rec ,
+.Cm igain , ogain ,
+.Cm line1 , line2 , line3 ,
+.Cm dig1 , dig2 , dig3 ,
+.Cm phin , phout , video , radio ,
+and
+.Cm monitor .
.Ed
.Pp
Not all mixer devices are available.
@@ -91,33 +98,41 @@ More than one device may be specified.
.Pp
Commands use the following format:
.Bl -column xxxxxxxxxxxxxxxxxxxxxxxx -offset indent
-.It Sy "Name Action"
-.It "dev Display all controls"
-.It "dev.control Display only the specified control"
-.It "dev.control=value Set control value"
+.It Sy Name Ta Sy Action
+.It Ar dev Ta Display all controls
+.It Ar dev Ns Cm \&. Ns Ar control Ta Display only the specified control
+.It Ar dev Ns Cm \&. Ns Ar control Ns Cm \&= Ns Ar value Ta Set control value
.El
.Pp
The available controls are as follows (replace
.Ar dev
with one of the available devices):
+.Sm off
.Bl -column xxxxxxxxxxxxxxxxxxxxxxxx -offset indent
-.It Sy "Name Value"
-.It "dev.volume [[+|-]lvol[:[+|-]rvol]]"
-.It "dev.mute {0|1|^}"
-.It "dev.recsrc {+|-|^|=}"
+.It Sy Name Ta Sy Value
+.It Ar dev Cm .volume Ta Xo
+.Ar vol |
+.Oo Cm \&+ | Cm \&- Oc Ar lvol
+.Oo Cm \&: Oo Cm \&+ | Cm \&- Oc Ar rvol Oc
+.Xc
+.It Ar dev Cm .mute Ta Cm 0 | 1 | ^
+.It Ar dev Cm .recsrc Ta Cm ^ | + | - | =
.El
+.Sm on
.Pp
The
-.Ar dev.volume
+.Ar dev Ns Cm .volume
control modifies a device's volume.
The optional
.Ar lvol
and/or
.Ar rvol
values have to be specified.
-The values have to be normalized 32-bit floats, from 0.0 to 1.0 inclusivly.
-If no "." character is present, the value is treated like a percentage, for backwards compatibility.
-If the the left or right volume values are prefixed with
+The values have to be normalized 32-bit floats, from 0.0 to 1.0 inclusively.
+If no
+.Ql \&.
+character is present, the value is treated like a percentage, for backwards compatibility.
+If the left or right volume values are prefixed with
.Cm +
or
.Cm - ,
@@ -125,32 +140,32 @@ the value following will be used as a relative adjustment, modifying the
current settings by the amount specified.
.Pp
The
-.Ar dev.mute
+.Ar dev Ns Cm .mute
control (un)mutes a device.
The following values are available:
.Bl -tag -width = -offset indent
.It Cm 0
unmutes
-.Ar dev .
+.Ar dev
.It Cm 1
mutes
-.Ar dev .
+.Ar dev
.It Cm ^
toggles the mute of
-.Ar dev .
+.Ar dev
.El
.Pp
The
-.Ar dev.recsrc
+.Ar dev Ns Cm .recsrc
control modifies the recording sources of a mixer.
.Nm
marks devices which can be used as a recording source with
-.Ar rec .
+.Sy rec .
Recording sources are marked with
-.Ar src .
+.Sy src .
To modify the recording source you can use one of the following modifiers
on a
-.Ar rec
+.Sy rec
device:
.Bl -tag -width = -offset indent
.It Cm ^
@@ -177,9 +192,9 @@ The mixer device, where
is the number of that device, for example
.Ar /dev/mixer0 .
PCM cards and mixers have a 1:1 relationship, which means that
-.Ar mixer0
+.Pa /dev/mixer0
is the mixer for
-.Ar pcm0
+.Pa /dev/pcm0
and so on.
By default,
.Nm
@@ -187,8 +202,8 @@ prints both the audio card's number and the mixer associated with it
in the form of
.Ar pcmN:mixer .
The
-.Ar /dev/mixer
-file, although it doesn't exist in the filesystem, points to the default
+.Pa /dev/mixer
+file, although it does not exist in the filesystem, points to the default
mixer device and is the file
.Nm
opens when the
@@ -197,45 +212,45 @@ option has not been specified.
.El
.Sh EXAMPLES
Change the volume for the
-.Ar vol
+.Cm vol
device of the
-.Ar /dev/mixer0
+.Pa /dev/mixer0
mixer device to 0.65:
-.Bl -tag -width Ds -offset indent
-.It $ mixer -f /dev/mixer0 vol.volume=0.65
-.El
+.Bd -literal -offset indent
+$ mixer -f /dev/mixer0 vol.volume=0.65
+.Ed
.Pp
Increase the
-.Ar mic
+.Cm mic
device's left volume by 0.10 and decrease the right
volume by 0.05:
-.Bl -tag -width Ds -offset indent
-.It $ mixer mic.volume=+0.10:-0.05
-.El
+.Bd -literal -offset indent
+$ mixer mic.volume=+0.10:-0.05
+.Ed
.Pp
Toggle the mute for
-.Ar vol :
-.Bl -tag -width Ds -offset indent
-.It $ mixer vol.mute=^
-.El
+.Cm vol :
+.Bd -literal -offset indent
+$ mixer vol.mute=^
+.Ed
.Pp
Set
-.Ar mic
+.Cm mic
and toggle
-.Ar line
+.Cm line
recording sources:
-.Bl -tag -width Ds -offset indent
-.It $ mixer mic.recsrc=+ line.recsrc=^
-.El
+.Bd -literal -offset indent
+$ mixer mic.recsrc=+ line.recsrc=^
+.Ed
.Pp
Dump
-.Ar /dev/mixer0
-information to a file and retrieve back later
-.Bl -tag -width Ds -offset indent
-.It $ mixer -f /dev/mixer0 -o > info
-.It ...
-.It $ mixer -f /dev/mixer0 `cat info`
-.El
+.Pa /dev/mixer0
+information to a file and retrieve back later:
+.Bd -literal -offset indent
+$ mixer -f /dev/mixer0 -o > info
+\&...
+$ mixer -f /dev/mixer0 `cat info`
+.Ed
.Sh SEE ALSO
.Xr mixer 3 ,
.Xr sound 4 ,
