summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Chiluk <chiluk@ubuntu.com>2019-08-08 23:10:01 -0500
committerArun Raghavan <arun@arunraghavan.net>2019-12-05 03:02:28 +0000
commit1ee1f749e154d2f64b4661f833eebaa18ae1a081 (patch)
tree18e321b251e3ba80c1db74f0b9f6c6df29691620
parent79d3b99ba4773651c4ebc082233f9d0b5f68bfad (diff)
alsa-mixer: add support for LucidSound LS31, and create usb-gaming-headset profile
-rw-r--r--src/Makefile.am8
-rw-r--r--src/modules/alsa/90-pulseaudio.rules10
-rw-r--r--src/modules/alsa/mixer/paths/usb-gaming-headset-input.conf (renamed from src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf)12
-rw-r--r--src/modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf (renamed from src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf)15
-rw-r--r--src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf (renamed from src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf)15
-rw-r--r--src/modules/alsa/mixer/profile-sets/usb-gaming-headset.conf (renamed from src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf)19
6 files changed, 52 insertions, 27 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 3db921a0..0f1ded7f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1354,7 +1354,7 @@ dist_alsaprofilesets_DATA = \
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-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/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/steelseries-arctis-output-chat-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/steelseries-arctis-7-output-mono.conf \
- modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.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
diff --git a/src/modules/alsa/90-pulseaudio.rules b/src/modules/alsa/90-pulseaudio.rules
index 61e76925..fa43cb80 100644
--- a/src/modules/alsa/90-pulseaudio.rules
+++ b/src/modules/alsa/90-pulseaudio.rules
@@ -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: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"
+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
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf b/src/modules/alsa/mixer/paths/usb-gaming-headset-input.conf
index 3fa36e93..9fa7fe90 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf
+++ b/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
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf b/src/modules/alsa/mixer/paths/usb-gaming-headset-output-mono.conf
index d8b24a2f..6df662f0 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf
+++ b/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
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf b/src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf
index fcc58a03..e3f91cd6 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf
+++ b/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
diff --git a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/usb-gaming-headset.conf
index e1394dcf..01ecf864 100644
--- a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf
+++ b/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]