mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-mixer: add support for LucidSound LS31, and create usb-gaming-headset profile

Browse source
This commit is contained in:
Dave Chiluk 2019-08-08 23:10:01 -05:00 • committed by Arun Raghavan
parent 79d3b99ba4
commit 1ee1f749e1
6 changed files with 52 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Makefile.am
View file

@ -1354,7 +1354,7 @@ dist_alsaprofilesets_DATA = \
modules/alsa/mixer/profile-sets/kinect-audio.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/sb-omni-surround-5.1.conf \
modules/alsa/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf \ modules/alsa/mixer/profile-sets/steelseries-arctis-common-usb-audio.conf \
modules/alsa/mixer/profile-sets/steelseries-arctis-7-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/dell-dock-tb16-usb-audio.conf \
modules/alsa/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf modules/alsa/mixer/profile-sets/cmedia-high-speed-true-hdaudio.conf
@ -1401,9 +1401,9 @@ dist_alsapaths_DATA = \
modules/alsa/mixer/paths/hdmi-output-7.conf \ modules/alsa/mixer/paths/hdmi-output-7.conf \
modules/alsa/mixer/paths/steelseries-arctis-output-chat-common.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/steelseries-arctis-output-game-common.conf \
modules/alsa/mixer/paths/steelseries-arctis-7-input.conf \ modules/alsa/mixer/paths/usb-gaming-headset-input.conf \
modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf \ modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf \
modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
endif endif

10
src/modules/alsa/90-pulseaudio.rules
View file

@ -113,10 +113,12 @@ ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-
# ID 1038:12ad is for the 2018 refresh of the Arctis 7. # 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). # 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}=="1260", ENV{PULSE_PROFILE_SET}="usb-gaming-headset.conf"
ATTRS{idVendor}=="1038", ATTRS{idProduct}=="12ad", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.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}="steelseries-arctis-7-usb-audio.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}="steelseries-arctis-7-usb-audio.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 1038:1250 is for the Arctis 5
# ID 1037:12aa is for the Arctis 5 2019 # ID 1037:12aa is for the Arctis 5 2019

12
src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-input.conf
View file

@ -13,8 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
; Steelseries Arctis 7 USB headset microphone path. Works also with Arctis Pro ; USB gaming headset microphone input path. These headsets usually have two
; Wireless. ; 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] [General]
description-key = analog-input-microphone-headset description-key = analog-input-microphone-headset

15
src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf
View file

@ -13,11 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
; Steelseries Arctis 7 USB headset mono output path. Works also with Arctis Pro ; USB gaming headset mono output path. These headsets usually have two
; Wireless. The headset has two output devices. The first one is mono, meant ; output devices. The first one is mono, meant for voice audio, and the second
; for voice audio, and the second one is stereo, meant for everything else. The ; one is stereo, meant for everything else. The purpose of this unusual design
; purpose of this unusual design is to provide separate volume controls for ; is to provide separate volume controls for voice and other audio, which can
; voice and other audio, which can be useful in gaming. ; be useful in gaming.
;
; Works with:
; Steelseries Arctis 7
; Steelseries Arctis Pro Wireless.
; Lucidsound LS31
[General] [General]
description-key = analog-output-headphones-mono description-key = analog-output-headphones-mono

15
src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf → src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
View file

@ -13,11 +13,16 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
; Steelseries Arctis 7 USB headset stereo output path. Works also with Arctis ; USB gaming headset mono output path. These headsets usually have two
; Pro Wireless. The headset has two output devices. The first one is mono, ; output devices. The first one is mono, meant for voice audio, and the second
; meant for voice audio, and the second one is stereo, meant for everything ; one is stereo, meant for everything else. The purpose of this unusual design
; else. The purpose of this unusual design is to provide separate volume ; is to provide separate volume controls for voice and other audio, which can
; controls for voice and other audio, which can be useful in gaming. ; 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 ; This path doesn't provide hardware volume control, because the stereo
; output is controlled by the PCM element with index 1, and currently ; output is controlled by the PCM element with index 1, and currently

15
src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf → src/modules/alsa/mixer/profile-sets/usb-gaming-headset.conf
View file

@ -13,12 +13,17 @@
# You should have received a copy of the GNU Lesser General Public License # You should have received a copy of the GNU Lesser General Public License
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>. # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
; Steelseries Arctis 7 USB and Arctis Pro Wireless USB headset. These headsets ; USB gaming headset.
; have a microphone and two output devices. The first output device is mono, ; 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 ; 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 ; else. The purpose of this unusual design is to provide separate volume
; controls for voice and other audio, which can be useful in gaming. ; 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. ; See default.conf for an explanation on the directives used here.
[General] [General]
@ -27,13 +32,13 @@ auto-profiles = yes
[Mapping analog-mono] [Mapping analog-mono]
device-strings = hw:%f,0,0 device-strings = hw:%f,0,0
channel-map = mono channel-map = mono
paths-output = steelseries-arctis-7-output-mono paths-output = usb-gaming-headset-output-mono
paths-input = steelseries-arctis-7-input paths-input = usb-gaming-headset-input
[Mapping analog-stereo] [Mapping analog-stereo]
device-strings = hw:%f,1,0 device-strings = hw:%f,1,0
channel-map = left,right channel-map = left,right
paths-output = steelseries-arctis-7-output-stereo paths-output = usb-gaming-headset-output-stereo
direction = output direction = output
[Profile output:analog-mono+output:analog-stereo+input:analog-mono] [Profile output:analog-mono+output:analog-stereo+input:analog-mono]