[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 3 commits: alsa-mixer: add support for SteelSeries Arctis Pro 2019 headset
Arun Raghavan
gitlab at gitlab.freedesktop.org
Thu Dec 5 03:09:33 UTC 2019
Arun Raghavan pushed to branch master at PulseAudio / pulseaudio
Commits:
7259e8c2 by Josh at 2019-12-05T03:02:28Z
alsa-mixer: add support for SteelSeries Arctis Pro 2019 headset
Signed-off-by: Dave Chiluk <chiluk at ubuntu.com>
- - - - -
79d3b99b by Krzysztof Stasiowski at 2019-12-05T03:02:28Z
alsa-mixer: Add support for SteelSeries Arctis 5 2019 headset
Signed-off-by: Dave Chiluk <chiluk at ubuntu.com>
- - - - -
1ee1f749 by Dave Chiluk at 2019-12-05T03:02:28Z
alsa-mixer: add support for LucidSound LS31, and create usb-gaming-headset profile
- - - - -
9 changed files:
- src/Makefile.am
- src/modules/alsa/90-pulseaudio.rules
- src/modules/alsa/mixer/paths/steelseries-arctis-5-output-chat.conf → src/modules/alsa/mixer/paths/steelseries-arctis-output-chat-common.conf
- src/modules/alsa/mixer/paths/steelseries-arctis-5-output-game.conf → src/modules/alsa/mixer/paths/steelseries-arctis-output-game-common.conf
- src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-input.conf
- src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf
- src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
- src/modules/alsa/mixer/profile-sets/steelseries-arctis-5-usb-audio.conf → src/modules/alsa/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
- src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf → src/modules/alsa/mixer/profile-sets/usb-gaming-headset.conf
Changes:
=====================================
src/Makefile.am
=====================================
@@ -1353,8 +1353,8 @@ dist_alsaprofilesets_DATA = \
modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \
modules/alsa/mixer/profile-sets/kinect-audio.conf \
modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf \
- modules/alsa/mixer/profile-sets/steelseries-arctis-5-usb-audio.conf \
- modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf \
+ modules/alsa/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf \
+ modules/alsa/mixer/profile-sets/usb-gaming-headset.conf \
modules/alsa/mixer/profile-sets/dell-dock-tb16-usb-audio.conf \
modules/alsa/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf
@@ -1399,11 +1399,11 @@ dist_alsapaths_DATA = \
modules/alsa/mixer/paths/hdmi-output-5.conf \
modules/alsa/mixer/paths/hdmi-output-6.conf \
modules/alsa/mixer/paths/hdmi-output-7.conf \
- modules/alsa/mixer/paths/steelseries-arctis-5-output-chat.conf \
- modules/alsa/mixer/paths/steelseries-arctis-5-output-game.conf \
- modules/alsa/mixer/paths/steelseries-arctis-7-input.conf \
- modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf \
- modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf
+ modules/alsa/mixer/paths/steelseries-arctis-output-chat-common.conf \
+ modules/alsa/mixer/paths/steelseries-arctis-output-game-common.conf \
+ modules/alsa/mixer/paths/usb-gaming-headset-input.conf \
+ modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf \
+ modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
endif
=====================================
src/modules/alsa/90-pulseaudio.rules
=====================================
@@ -109,15 +109,23 @@ ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudi
ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
-ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1250", ENV{PULSE_PROFILE_SET}="steelseries-arctis-5-usb-audio.conf"
+
# ID 1038:12ad is for the 2018 refresh of the Arctis 7.
-# ID 1038:1294 is for Arctis Pro Wireless (which works with the Arctis 7
-# configuration).
-ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1260", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.conf"
-ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12ad", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.conf"
-ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1294", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.conf"
-ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.conf"
+# ID 1038:1294 is for Arctis Pro Wireless (which works with the Arctis 7 configuration).
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1260", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12ad", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1294", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+# Lucidsound LS31
+ATTRS{idVendor}=="2f12", ATTRS{idProduct}=="0109", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
+
+# ID 1038:1250 is for the Arctis 5
+# ID 1037:12aa is for the Arctis 5 2019
+# ID 1038:1252 is for the Arctis Pro 2019 edition
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1250", ENV{PULSE_PROFILE_SET}="steelseries-arctis-common-usb-audio.conf"
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12aa", ENV{PULSE_PROFILE_SET}="steelseries-arctis-common-usb-audio.conf"
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1252", ENV{PULSE_PROFILE_SET}="steelseries-arctis-common-usb-audio.conf"
ATTRS{idVendor}=="147a", ATTRS{idProduct}=="e055", ENV{PULSE_PROFILE_SET}="cmedia-high-speed-true-hdaudio.conf"
=====================================
src/modules/alsa/mixer/paths/steelseries-arctis-5-output-chat.conf → src/modules/alsa/mixer/paths/steelseries-arctis-output-chat-common.conf
=====================================
=====================================
src/modules/alsa/mixer/paths/steelseries-arctis-5-output-game.conf → src/modules/alsa/mixer/paths/steelseries-arctis-output-game-common.conf
=====================================
=====================================
src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-input.conf
=====================================
@@ -13,8 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-; Steelseries Arctis 7 USB headset microphone path. Works also with Arctis Pro
-; Wireless.
+; USB gaming headset microphone input path. These headsets usually have two
+; output devices. The first one is mono, meant for voice audio, and the second
+; one is stereo, meant for everything else. The purpose of this unusual design
+; is to provide separate volume controls for voice and other audio, which can
+; be useful in gaming.
+;
+; Works with:
+; Steelseries Arctis 7
+; Steelseries Arctis Pro Wireless.
+; Lucidsound LS31
[General]
description-key = analog-input-microphone-headset
=====================================
src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf
=====================================
@@ -13,11 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-; Steelseries Arctis 7 USB headset mono output path. Works also with Arctis Pro
-; Wireless. The headset has two output devices. The first one is mono, meant
-; for voice audio, and the second one is stereo, meant for everything else. The
-; purpose of this unusual design is to provide separate volume controls for
-; voice and other audio, which can be useful in gaming.
+; USB gaming headset mono output path. These headsets usually have two
+; output devices. The first one is mono, meant for voice audio, and the second
+; one is stereo, meant for everything else. The purpose of this unusual design
+; is to provide separate volume controls for voice and other audio, which can
+; be useful in gaming.
+;
+; Works with:
+; Steelseries Arctis 7
+; Steelseries Arctis Pro Wireless.
+; Lucidsound LS31
[General]
description-key = analog-output-headphones-mono
=====================================
src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
=====================================
@@ -13,11 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-; Steelseries Arctis 7 USB headset stereo output path. Works also with Arctis
-; Pro Wireless. The headset has two output devices. The first one is mono,
-; meant for voice audio, and the second one is stereo, meant for everything
-; else. The purpose of this unusual design is to provide separate volume
-; controls for voice and other audio, which can be useful in gaming.
+; USB gaming headset mono output path. These headsets usually have two
+; output devices. The first one is mono, meant for voice audio, and the second
+; one is stereo, meant for everything else. The purpose of this unusual design
+; is to provide separate volume controls for voice and other audio, which can
+; be useful in gaming.
+;
+; Works with:
+; Steelseries Arctis 7
+; Steelseries Arctis Pro Wireless.
+; Lucidsound LS31
;
; This path doesn't provide hardware volume control, because the stereo
; output is controlled by the PCM element with index 1, and currently
=====================================
src/modules/alsa/mixer/profile-sets/steelseries-arctis-5-usb-audio.conf → src/modules/alsa/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf
=====================================
@@ -6,13 +6,13 @@ description = Chat
device-strings = hw:%f,0,0
channel-map = left,right
paths-input = analog-input-mic
-paths-output = steelseries-arctis-5-output-chat
+paths-output = steelseries-arctis-output-chat-common
[Mapping analog-game]
description = Game
device-strings = hw:%f,1,0
channel-map = left,right
-paths-output = steelseries-arctis-5-output-game
+paths-output = steelseries-arctis-output-game-common
direction = output
[Profile output:analog-chat+output:analog-game+input:analog-chat]
=====================================
src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf → src/modules/alsa/mixer/profile-sets/usb-gaming-headset.conf
=====================================
@@ -13,12 +13,17 @@
# You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-; Steelseries Arctis 7 USB and Arctis Pro Wireless USB headset. These headsets
-; have a microphone and two output devices. The first output device is mono,
-; meant for voice audio, and the second one is stereo, meant for everything
-; else. The purpose of this unusual design is to provide separate volume
+; USB gaming headset.
+; These headsets usually have two output devices. The first one is mono,
+; meant for voice audio, and the second one is stereo, meant for everything
+; else. The purpose of this unusual design is to provide separate volume
; controls for voice and other audio, which can be useful in gaming.
;
+; Works with:
+; Steelseries Arctis 7
+; Steelseries Arctis Pro Wireless.
+; Lucidsound LS31
+;
; See default.conf for an explanation on the directives used here.
[General]
@@ -27,13 +32,13 @@ auto-profiles = yes
[Mapping analog-mono]
device-strings = hw:%f,0,0
channel-map = mono
-paths-output = steelseries-arctis-7-output-mono
-paths-input = steelseries-arctis-7-input
+paths-output = usb-gaming-headset-output-mono
+paths-input = usb-gaming-headset-input
[Mapping analog-stereo]
device-strings = hw:%f,1,0
channel-map = left,right
-paths-output = steelseries-arctis-7-output-stereo
+paths-output = usb-gaming-headset-output-stereo
direction = output
[Profile output:analog-mono+output:analog-stereo+input:analog-mono]
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/f899d5f4669dcd536cc142cee99fe359dd8af3d6...1ee1f749e154d2f64b4661f833eebaa18ae1a081
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/f899d5f4669dcd536cc142cee99fe359dd8af3d6...1ee1f749e154d2f64b4661f833eebaa18ae1a081
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20191205/5b66b9a1/attachment-0001.html>
More information about the pulseaudio-commits
mailing list