|
 |
e44045 |
From 15386a710c1500f70085a6312fb4d84be4d254c9 Mon Sep 17 00:00:00 2001
|
|
|
e44045 |
From: =?UTF-8?q?Johan=20Heikkil=C3=A4?= <johan.heikkila@gmail.com>
|
|
|
e44045 |
Date: Sun, 27 Aug 2017 16:29:37 +0300
|
|
|
e44045 |
Subject: [PATCH 16/48] alsa-mixer: add support for Steelseries Arctis 7
|
|
|
e44045 |
headset
|
|
|
e44045 |
|
|
|
e44045 |
---
|
|
|
e44045 |
src/modules/alsa/alsa-mixer.c | 1 +
|
|
|
e44045 |
.../alsa/mixer/paths/steelseries-arctis-input.conf | 25 +++++++++++++
|
|
|
e44045 |
.../paths/steelseries-arctis-output-mono.conf | 29 +++++++++++++++
|
|
|
e44045 |
.../paths/steelseries-arctis-output-stereo.conf | 27 ++++++++++++++
|
|
|
e44045 |
.../alsa/mixer/profile-sets/90-pulseaudio.rules | 1 +
|
|
|
e44045 |
.../profile-sets/steelseries-arctis-usb-audio.conf | 43 ++++++++++++++++++++++
|
|
|
e44045 |
6 files changed, 126 insertions(+)
|
|
|
e44045 |
create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
|
|
|
e44045 |
create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
|
|
|
e44045 |
create mode 100644 src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
|
|
|
e44045 |
create mode 100644 src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
|
|
|
e44045 |
|
|
|
e44045 |
diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
|
|
|
e44045 |
index aeaf12c4..08ea45d3 100644
|
|
|
e44045 |
--- a/src/modules/alsa/alsa-mixer.c
|
|
|
e44045 |
+++ b/src/modules/alsa/alsa-mixer.c
|
|
|
e44045 |
@@ -2469,6 +2469,7 @@ static int path_verify(pa_alsa_path *p) {
|
|
|
e44045 |
{ "analog-input-video", N_("Video") },
|
|
|
e44045 |
{ "analog-output", N_("Analog Output") },
|
|
|
e44045 |
{ "analog-output-headphones", N_("Headphones") },
|
|
|
e44045 |
+ { "analog-output-headphones-mono", N_("Headphones Mono Output") },
|
|
|
e44045 |
{ "analog-output-lfe-on-mono", N_("LFE on Separate Mono Output") },
|
|
|
e44045 |
{ "analog-output-lineout", N_("Line Out") },
|
|
|
e44045 |
{ "analog-output-mono", N_("Analog Mono Output") },
|
|
|
e44045 |
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
|
|
|
e44045 |
new file mode 100644
|
|
|
e44045 |
index 00000000..f3115ba6
|
|
|
e44045 |
--- /dev/null
|
|
|
e44045 |
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-input.conf
|
|
|
e44045 |
@@ -0,0 +1,25 @@
|
|
|
e44045 |
+# This file is part of PulseAudio.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is free software; you can redistribute it and/or modify
|
|
|
e44045 |
+# it under the terms of the GNU Lesser General Public License as
|
|
|
e44045 |
+# published by the Free Software Foundation; either version 2.1 of the
|
|
|
e44045 |
+# License, or (at your option) any later version.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is distributed in the hope that it will be useful, but
|
|
|
e44045 |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
e44045 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
e44045 |
+# General Public License for more details.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# You should have received a copy of the GNU Lesser General Public License
|
|
|
e44045 |
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
e44045 |
+
|
|
|
e44045 |
+; Steelseries Arctis 7 USB headset microphone path.
|
|
|
e44045 |
+
|
|
|
e44045 |
+[General]
|
|
|
e44045 |
+description-key = analog-input-microphone-headset
|
|
|
e44045 |
+
|
|
|
e44045 |
+[Element Headset]
|
|
|
e44045 |
+volume = merge
|
|
|
e44045 |
+switch = mute
|
|
|
e44045 |
+override-map.1 = all
|
|
|
e44045 |
+override-map.2 = all-left,all-right
|
|
|
e44045 |
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
|
|
|
e44045 |
new file mode 100644
|
|
|
e44045 |
index 00000000..67950618
|
|
|
e44045 |
--- /dev/null
|
|
|
e44045 |
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-output-mono.conf
|
|
|
e44045 |
@@ -0,0 +1,29 @@
|
|
|
e44045 |
+# This file is part of PulseAudio.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is free software; you can redistribute it and/or modify
|
|
|
e44045 |
+# it under the terms of the GNU Lesser General Public License as
|
|
|
e44045 |
+# published by the Free Software Foundation; either version 2.1 of the
|
|
|
e44045 |
+# License, or (at your option) any later version.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is distributed in the hope that it will be useful, but
|
|
|
e44045 |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
e44045 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
e44045 |
+# General Public License for more details.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# You should have received a copy of the GNU Lesser General Public License
|
|
|
e44045 |
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
e44045 |
+
|
|
|
e44045 |
+; Steelseries Arctis 7 USB headset mono output path. The headset has two
|
|
|
e44045 |
+; output devices. The first one is mono, meant for voice audio, and the
|
|
|
e44045 |
+; second one is stereo, meant for everything else. The purpose of this
|
|
|
e44045 |
+; unusual design is to provide separate volume controls for voice and
|
|
|
e44045 |
+; other audio, which can be useful in gaming.
|
|
|
e44045 |
+
|
|
|
e44045 |
+[General]
|
|
|
e44045 |
+description-key = analog-output-headphones-mono
|
|
|
e44045 |
+
|
|
|
e44045 |
+[Element PCM]
|
|
|
e44045 |
+volume = merge
|
|
|
e44045 |
+switch = mute
|
|
|
e44045 |
+override-map.1 = all
|
|
|
e44045 |
+override-map.2 = all-left,all-right
|
|
|
e44045 |
diff --git a/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf b/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
|
|
|
e44045 |
new file mode 100644
|
|
|
e44045 |
index 00000000..4e10c800
|
|
|
e44045 |
--- /dev/null
|
|
|
e44045 |
+++ b/src/modules/alsa/mixer/paths/steelseries-arctis-output-stereo.conf
|
|
|
e44045 |
@@ -0,0 +1,27 @@
|
|
|
e44045 |
+# This file is part of PulseAudio.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is free software; you can redistribute it and/or modify
|
|
|
e44045 |
+# it under the terms of the GNU Lesser General Public License as
|
|
|
e44045 |
+# published by the Free Software Foundation; either version 2.1 of the
|
|
|
e44045 |
+# License, or (at your option) any later version.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is distributed in the hope that it will be useful, but
|
|
|
e44045 |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
e44045 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
e44045 |
+# General Public License for more details.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# You should have received a copy of the GNU Lesser General Public License
|
|
|
e44045 |
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
e44045 |
+
|
|
|
e44045 |
+; Steelseries Arctis 7 USB headset stereo output path. The headset has two
|
|
|
e44045 |
+; output devices. The first one is mono, meant for voice audio, and the
|
|
|
e44045 |
+; second one is stereo, meant for everything else. The purpose of this
|
|
|
e44045 |
+; unusual design is to provide separate volume controls for voice and
|
|
|
e44045 |
+; other audio, which can be useful in gaming.
|
|
|
e44045 |
+;
|
|
|
e44045 |
+; This path doesn't provide hardware volume control, because the stereo
|
|
|
e44045 |
+; output is controlled by the PCM element with index 1, and currently
|
|
|
e44045 |
+; PulseAudio only supports elements with index 0.
|
|
|
e44045 |
+
|
|
|
e44045 |
+[General]
|
|
|
e44045 |
+description-key = analog-output-headphones
|
|
|
e44045 |
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
e44045 |
index 805a05b2..2392ca50 100644
|
|
|
e44045 |
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
e44045 |
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
|
|
|
e44045 |
@@ -99,5 +99,6 @@ ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudi
|
|
|
e44045 |
ATTRS{idVendor}=="045e", ATTRS{idProduct}=="02bb", ENV{PULSE_PROFILE_SET}="kinect-audio.conf"
|
|
|
e44045 |
ATTRS{idVendor}=="041e", ATTRS{idProduct}=="322c", ENV{PULSE_PROFILE_SET}="sb-omni-surround-5.1.conf"
|
|
|
e44045 |
ATTRS{idVendor}=="0bda", ATTRS{idProduct}=="4014", ENV{PULSE_PROFILE_SET}="dell-dock-tb16-usb-audio.conf"
|
|
|
e44045 |
+ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1260", ENV{PULSE_PROFILE_SET}="steelseries-arctis-usb-audio.conf"
|
|
|
e44045 |
|
|
|
e44045 |
LABEL="pulseaudio_end"
|
|
|
e44045 |
diff --git a/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
|
|
|
e44045 |
new file mode 100644
|
|
|
e44045 |
index 00000000..d3563a16
|
|
|
e44045 |
--- /dev/null
|
|
|
e44045 |
+++ b/src/modules/alsa/mixer/profile-sets/steelseries-arctis-usb-audio.conf
|
|
|
e44045 |
@@ -0,0 +1,43 @@
|
|
|
e44045 |
+# This file is part of PulseAudio.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is free software; you can redistribute it and/or modify
|
|
|
e44045 |
+# it under the terms of the GNU Lesser General Public License as
|
|
|
e44045 |
+# published by the Free Software Foundation; either version 2.1 of the
|
|
|
e44045 |
+# License, or (at your option) any later version.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# PulseAudio is distributed in the hope that it will be useful, but
|
|
|
e44045 |
+# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
e44045 |
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
e44045 |
+# General Public License for more details.
|
|
|
e44045 |
+#
|
|
|
e44045 |
+# You should have received a copy of the GNU Lesser General Public License
|
|
|
e44045 |
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
|
|
e44045 |
+
|
|
|
e44045 |
+; Steelseries Arctis 7 USB headset. The headset has a microphone and two output
|
|
|
e44045 |
+; devices. The first output device is mono, meant for voice audio, and the
|
|
|
e44045 |
+; second one is stereo, meant for everything else. The purpose of this unusual
|
|
|
e44045 |
+; design is to provide separate volume controls for voice and other audio,
|
|
|
e44045 |
+; which can be useful in gaming.
|
|
|
e44045 |
+;
|
|
|
e44045 |
+; See default.conf for an explanation on the directives used here.
|
|
|
e44045 |
+
|
|
|
e44045 |
+[General]
|
|
|
e44045 |
+auto-profiles = yes
|
|
|
e44045 |
+
|
|
|
e44045 |
+[Mapping analog-mono]
|
|
|
e44045 |
+device-strings = hw:%f,0,0
|
|
|
e44045 |
+channel-map = mono
|
|
|
e44045 |
+paths-output = steelseries-arctis-output-mono
|
|
|
e44045 |
+paths-input = steelseries-arctis-input
|
|
|
e44045 |
+
|
|
|
e44045 |
+[Mapping analog-stereo]
|
|
|
e44045 |
+device-strings = hw:%f,1,0
|
|
|
e44045 |
+channel-map = left,right
|
|
|
e44045 |
+paths-output = steelseries-arctis-output-stereo
|
|
|
e44045 |
+direction = output
|
|
|
e44045 |
+
|
|
|
e44045 |
+[Profile output:analog-mono+output:analog-stereo+input:analog-mono]
|
|
|
e44045 |
+output-mappings = analog-mono analog-stereo
|
|
|
e44045 |
+input-mappings = analog-mono
|
|
|
e44045 |
+priority = 5100
|
|
|
e44045 |
+skip-probe = yes
|
|
|
e44045 |
--
|
|
|
e44045 |
2.13.6
|
|
|
e44045 |
|