summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjorisc90 <joris@claassen.co>2018-10-25 23:59:13 +0000
committerTanu Kaskinen <tanuk@iki.fi>2018-11-16 13:33:57 +0200
commitfe6a9a8f59932f29cc77eac2a7e2c6bd07c8c7d0 (patch)
treec0fac39a0211de0e4e5906ff82b64fa47178431b
parent547998db4497b096d8aa424e5b2f5aa4c11514a9 (diff)
alsa-mixer: Update to support Arctis Pro Wireless headset
The Arctis 7 configuration can be used as is - the ALSA PCM and mixer interfaces are the same.
-rw-r--r--src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf3
-rw-r--r--src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf10
-rw-r--r--src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf10
-rw-r--r--src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules5
-rw-r--r--src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf10
5 files changed, 22 insertions, 16 deletions
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf
index f3115ba66..3fa36e938 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-7-input.conf
@@ -13,7 +13,8 @@
# 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.
+; Steelseries Arctis 7 USB headset microphone path. Works also with Arctis Pro
+; Wireless.
[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/steelseries-arctis-7-output-mono.conf
index 679506185..d8b24a2fb 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-mono.conf
@@ -13,11 +13,11 @@
# 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. 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.
+; 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.
[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/steelseries-arctis-7-output-stereo.conf
index 4e10c8005..fcc58a033 100644
--- a/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-7-output-stereo.conf
@@ -13,11 +13,11 @@
# 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. 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.
+; 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.
;
; 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/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
index 7272395e4..2bb898cfc 100644
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
@@ -110,7 +110,12 @@ ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinec
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: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}=="1294", ENV{PULSE_PROFILE_SET}="steelseries-arctis-7-usb-audio.conf"
+
ATTRS{idVendor}=="147a", ATTRS{idProduct}=="e055", ENV{PULSE_PROFILE_SET}="cmedia-high-speed-true-hdaudio.conf"
GOTO="pulseaudio_end"
diff --git a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf
index 8c061e1a1..e1394dcfc 100644
--- a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf
+++ b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-7-usb-audio.conf
@@ -13,11 +13,11 @@
# 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. The headset has 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 controls for voice and other audio,
-; which can be useful in gaming.
+; 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
+; controls for voice and other audio, which can be useful in gaming.
;
; See default.conf for an explanation on the directives used here.