summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa/mixer/paths/analog-output.conf
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-10-31 03:43:42 +0100
committerLennart Poettering <lennart@poettering.net>2009-11-11 05:17:32 +0100
commit4323c9f22f17d8fdd2a44aad5e1af4997a87a189 (patch)
tree2d9e5a22f85bcf869b1b6356de4ad136fb573072 /src/modules/alsa/mixer/paths/analog-output.conf
parent8a26fbf863d0c4f13cf56f28ba779a50e7335671 (diff)
alsa: create a seperate mixer path for Speaker elements
On some cards line-out is independant of Sepaker and it is a good idea to cover that so that they can independantly be activated. https://bugzilla.redhat.com/show_bug.cgi?id=520884
Diffstat (limited to 'src/modules/alsa/mixer/paths/analog-output.conf')
-rw-r--r--src/modules/alsa/mixer/paths/analog-output.conf11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
index b10efc20..d7c1223b 100644
--- a/src/modules/alsa/mixer/paths/analog-output.conf
+++ b/src/modules/alsa/mixer/paths/analog-output.conf
@@ -14,12 +14,13 @@
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
-; Intended for the 'default' output
+; Intended for the 'default' output. Note that a-o-speaker.conf has a
+; higher priority than this
;
; See analog-output.conf.common for an explanation on the directives
[General]
-priority = 100
+priority = 99
[Element Hardware Master]
switch = mute
@@ -37,7 +38,7 @@ override-map.2 = all-left,all-right
switch = off
volume = off
-; This profile path is intended to control the speaker, not the
+; This profile path is intended to control the default output, not the
; headphones. But it should not hurt if we leave the headphone jack
; enabled nonetheless.
[Element Headphone]
@@ -50,9 +51,7 @@ volume = zero
[Element Speaker]
switch = mute
-volume = merge
-override-map.1 = all
-override-map.2 = all-left,all-right
+volume = off
[Element Front]
switch = mute