Page MenuHomeFreeBSD
Files F140135857

D34545.diff
No OneTemporary
Actions

D34545.diff
View Options

diff --git a/sbin/devd/apple.conf b/sbin/devd/apple.conf
--- a/sbin/devd/apple.conf
+++ b/sbin/devd/apple.conf
@@ -44,7 +44,7 @@
match "system" "PMU";
match "subsystem" "keys";
match "type" "mute";
- action "mixer 0";
+ action "mixer vol.volume=0";
};
notify 0 {
@@ -52,7 +52,7 @@
match "subsystem" "keys";
match "type" "volume";
match "notify" "down";
- action "mixer vol -10";
+ action "mixer vol.volume=-10";
};
notify 0 {
@@ -60,7 +60,7 @@
match "subsystem" "keys";
match "type" "volume";
match "notify" "up";
- action "mixer vol +10";
+ action "mixer vol.volume=+10";
};
# Eject key
diff --git a/sbin/devd/asus.conf b/sbin/devd/asus.conf
--- a/sbin/devd/asus.conf
+++ b/sbin/devd/asus.conf
@@ -7,21 +7,21 @@
match "system" "ACPI";
match "subsystem" "ASUS";
match "notify" "0x32";
- action "mixer 0";
+ action "mixer vol.volume=0";
};
notify 0 {
match "system" "ACPI";
match "subsystem" "ASUS";
match "notify" "0x31";
- action "mixer vol -10";
+ action "mixer vol.volume=-10";
};
notify 0 {
match "system" "ACPI";
match "subsystem" "ASUS";
match "notify" "0x30";
- action "mixer vol +10";
+ action "mixer vol.volume=+10";
};
# The next blocks enable volume hotkeys that can be found on the Asus EeePC
@@ -29,21 +29,21 @@
match "system" "ACPI";
match "subsystem" "ASUS-Eee";
match "notify" "0x13";
- action "mixer 0";
+ action "mixer vol.volume=0";
};
notify 0 {
match "system" "ACPI";
match "subsystem" "ASUS-Eee";
match "notify" "0x14";
- action "mixer vol -10";
+ action "mixer vol.volume=-10";
};
notify 0 {
match "system" "ACPI";
match "subsystem" "ASUS-Eee";
match "notify" "0x15";
- action "mixer vol +10";
+ action "mixer vol.volume=+10";
};
# Enable user hotkeys that can be found on the Asus EeePC
diff --git a/share/man/man4/acpi_ibm.4 b/share/man/man4/acpi_ibm.4
--- a/share/man/man4/acpi_ibm.4
+++ b/share/man/man4/acpi_ibm.4
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 24, 2020
+.Dd March 13, 2022
.Dt ACPI_IBM 4
.Os
.Sh NAME
@@ -451,11 +451,11 @@
LEVEL=`sysctl -n dev.acpi_ibm.0.mic_led`
if [ $LEVEL -eq 0 ]; then
sysctl dev.acpi_ibm.0.mic_led=1
- mixer rec 0
+ mixer rec.volume=0
fi
if [ $LEVEL -eq 1 ]; then
sysctl dev.acpi_ibm.0.mic_led=0
- mixer rec 30
+ mixer rec.volume=30
fi
;;
*)
diff --git a/usr.bin/fortune/datfiles/freebsd-tips b/usr.bin/fortune/datfiles/freebsd-tips
--- a/usr.bin/fortune/datfiles/freebsd-tips
+++ b/usr.bin/fortune/datfiles/freebsd-tips
@@ -339,8 +339,8 @@
``<ESC>w ! sudo tee %'' to force a write.
%
You can adjust the volume of various parts of the sound system in your
-computer by typing 'mixer <type> <volume>'. To get a list of what you can
-adjust, just type 'mixer'.
+computer by typing 'mixer <type>.volume=<volume>'. To get a list of what
+you can adjust, just type 'mixer'.
%
You can automatically download and install binary packages by doing
diff --git a/usr.bin/usbhidaction/usbhidaction.1 b/usr.bin/usbhidaction/usbhidaction.1
--- a/usr.bin/usbhidaction/usbhidaction.1
+++ b/usr.bin/usbhidaction/usbhidaction.1
@@ -28,7 +28,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd October 28, 2020
+.Dd March 13, 2022
.Dt USBHIDACTION 1
.Os
.Sh NAME
@@ -139,12 +139,11 @@
of Philips USB speakers with the HID controls on the speakers.
.Bd -literal -offset indent
# Configuration for various Philips USB speakers
-Consumer:Volume_Increment 1 0 mixer -f $1 vol +1
-Consumer:Volume_Decrement 1 0 mixer -f $1 vol -1
-# mute not supported
-#Consumer:Mute 1 0 mixer -f $1 mute
-Consumer:Channel_Top.Microsoft:Base_Up 1 0 mixer -f $1 bass +1
-Consumer:Channel_Top.Microsoft:Base_Down 1 0 mixer -f $1 bass -1
+Consumer:Volume_Increment 1 0 mixer -f $1 vol.volume=+1
+Consumer:Volume_Decrement 1 0 mixer -f $1 vol.volume=-1
+Consumer:Mute 1 0 mixer -f $1 mute.volume=^
+Consumer:Channel_Top.Microsoft:Base_Up 1 0 mixer -f $1 bass.volume=+1
+Consumer:Channel_Top.Microsoft:Base_Down 1 0 mixer -f $1 bass.volume=-1
.Ed
.Pp
A sample invocation using this configuration would be
@@ -154,9 +153,9 @@
The following example controls the mixer volume using a Logitech Wingman.
Notice the debounce of 1 for buttons and 5 for the slider.
.Bd -literal -offset indent
-Button:Button_1 1 1 mixer vol +10
-Button:Button_2 1 1 mixer vol -10
-Generic_Desktop:Z * 5 mixer vol `echo $V | awk '{print int($$1/255*100)}'`
+Button:Button_1 1 1 mixer vol.volume=+10
+Button:Button_2 1 1 mixer vol.volume=-10
+Generic_Desktop:Z * 5 mixer vol.volume=`echo $V | awk '{print int($$1/255*100)}'`
.Ed
.Sh SEE ALSO
.Xr usbhidctl 1 ,

File Metadata

Mime Type
text/plain
Expires
Sun, Dec 21, 5:30 PM (11 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27117143
Default Alt Text
D34545.diff (4 KB)

Event Timeline