[pulseaudio-commits] 3 commits - src/modules
Tanu Kaskinen
tanuk at kemper.freedesktop.org
Thu Aug 27 22:33:40 PDT 2015
src/modules/alsa/mixer/paths/analog-input-linein.conf | 7
src/modules/alsa/mixer/paths/analog-input-mic.conf | 7
src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules | 1
src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf | 72 ++++++++++
4 files changed, 87 insertions(+)
New commits:
commit 031ca878216c76a508da45fc086fa19509406771
Author: Tanu Kaskinen <tanuk at iki.fi>
Date: Mon Aug 10 17:22:38 2015 +0200
alsa-mixer: sb-omni-surround-5.1.conf: remove analog-surround-40 mapping
It was reported that the 4.0 mode doesn't work properly:
http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/23677/focus=23904
diff --git a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
index 84d8483..5795067 100644
--- a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
+++ b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
@@ -43,13 +43,6 @@ paths-output = analog-output
priority = 5
direction = output
-[Mapping analog-surround-40]
-device-strings = surround40:%f
-channel-map = front-left,front-right,rear-left,rear-right
-paths-output = analog-output
-priority = 6
-direction = output
-
[Mapping analog-surround-41]
device-strings = surround41:%f
channel-map = front-left,front-right,rear-left,rear-right,lfe
commit 9083750fc8c54708da87d49b3affce86770c08c5
Author: Tanu Kaskinen <tanuk at iki.fi>
Date: Thu Aug 6 12:13:54 2015 +0200
alsa-mixer: sb-omni-surround-5.1.conf: rename analog-stereo to analog-stereo-output
The mapping is only useful for output, and this renaming makes the
name symmetric with the input mapping.
diff --git a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
index 1c4aa7b..84d8483 100644
--- a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
+++ b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
@@ -23,11 +23,12 @@
[General]
auto-profiles = yes
-[Mapping analog-stereo]
+[Mapping analog-stereo-output]
device-strings = front:%f hw:%f
channel-map = left,right
paths-output = analog-output
priority = 10
+direction = output
[Mapping analog-stereo-input]
device-strings = hw:%f,1,0
@@ -75,4 +76,4 @@ device-strings = iec958:%f
channel-map = left,right
paths-output = iec958-stereo-output
priority = 5
-direction = output
\ No newline at end of file
+direction = output
commit b7744e5004b7dbd36bbb0ed7d211e7da3f5feb1b
Author: Nazar Mokrynskyi <nazar at mokrynskyi.com>
Date: Wed Jun 3 17:32:09 2015 +0200
alsa-mixer: Add support for Creative SoundBlaster Omni Surround 5.1 USB sound card
Mic and Line in inputs were not working at all, since they use the
hw:x,1,0 device, which is not supported in the default configuration.
diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf
index 5577ea6..2c94a0b 100644
--- a/src/modules/alsa/mixer/paths/analog-input-linein.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf
@@ -62,6 +62,13 @@ enumeration = select
name = analog-input-linein
required-any = any
+[Element PCM Capture Source]
+enumeration = select
+
+[Option PCM Capture Source:Line]
+name = analog-input-linein
+required-any = any
+
[Element Mic]
switch = off
volume = off
diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf
index a4d1c65..4d64f92 100644
--- a/src/modules/alsa/mixer/paths/analog-input-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf
@@ -69,6 +69,13 @@ enumeration = select
name = analog-input-microphone
required-any = any
+[Element PCM Capture Source]
+enumeration = select
+
+[Option PCM Capture Source:Mic]
+name = analog-input-microphone
+required-any = any
+
;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)"
[Element Mic Select]
diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
index eeb6ac4..70e34e6 100644
--- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
+++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules
@@ -97,5 +97,6 @@ ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1011", ENV{PULSE_PROFILE_SET}="nativ
ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1021", ENV{PULSE_PROFILE_SET}="native-instruments-traktor-audio10.conf"
ATTRS{idVendor}=="0763", ATTRS{idProduct}=="2012", ENV{PULSE_PROFILE_SET}="maudio-fasttrack-pro.conf"
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"
LABEL="pulseaudio_end"
diff --git a/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
new file mode 100644
index 0000000..1c4aa7b
--- /dev/null
+++ b/src/modules/alsa/mixer/profile-sets/sb-omni-surround-5.1.conf
@@ -0,0 +1,78 @@
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of the
+# License, or (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+; Creative Sound Blaster Omni Surround 5.1
+;
+; This sound card have Mic/Line in at hw:%f,1,0 - this is the main
+; difference from default.conf, also unsupported sections removed.
+;
+; See default.conf for an explanation on the directives used here.
+
+[General]
+auto-profiles = yes
+
+[Mapping analog-stereo]
+device-strings = front:%f hw:%f
+channel-map = left,right
+paths-output = analog-output
+priority = 10
+
+[Mapping analog-stereo-input]
+device-strings = hw:%f,1,0
+paths-input = analog-input-mic analog-input-linein
+channel-map = left,right
+direction = input
+
+[Mapping analog-surround-21]
+device-strings = surround21:%f
+channel-map = front-left,front-right,lfe
+paths-output = analog-output
+priority = 5
+direction = output
+
+[Mapping analog-surround-40]
+device-strings = surround40:%f
+channel-map = front-left,front-right,rear-left,rear-right
+paths-output = analog-output
+priority = 6
+direction = output
+
+[Mapping analog-surround-41]
+device-strings = surround41:%f
+channel-map = front-left,front-right,rear-left,rear-right,lfe
+paths-output = analog-output
+priority = 7
+direction = output
+
+[Mapping analog-surround-50]
+device-strings = surround50:%f
+channel-map = front-left,front-right,rear-left,rear-right,front-center
+paths-output = analog-output
+priority = 8
+direction = output
+
+[Mapping analog-surround-51]
+device-strings = surround51:%f
+channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
+paths-output = analog-output
+priority = 9
+direction = output
+
+[Mapping iec958-stereo]
+device-strings = iec958:%f
+channel-map = left,right
+paths-output = iec958-stereo-output
+priority = 5
+direction = output
\ No newline at end of file
More information about the pulseaudio-commits
mailing list