alsa-mixer: Ignore some elements in the analog-output path

The analog-output path should be suppressed when there are more
specific paths available. Currently that usually doesn't happen. The
suppression can be done with the path subset detection, and this patch
makes that work (another approach would be to mark the elements as
required-absent, like analog-input does, but I like the subset
suppression more, because it requires less stuff in the configuration
files). The problem with listing the now-removed elements in
analog-output.conf was that if the sound card had e.g. a Speaker
element, then the switch behaviour was different between analog-output
and analog-output-speakers, so analog-output was not considered a
subset of analog-output-speakers.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=74609
This commit is contained in:
Tanu Kaskinen 2014-10-27 13:00:00 +02:00
parent 5dfa83385c
commit 717834086c

View file

@ -22,14 +22,6 @@
[General] [General]
priority = 99 priority = 99
[Jack Line Out]
state.plugged = unknown
state.unplugged = unknown
[Jack Line Out Phantom]
state.plugged = unknown
state.unplugged = unknown
[Element Hardware Master] [Element Hardware Master]
switch = mute switch = mute
volume = merge volume = merge
@ -46,28 +38,6 @@ override-map.2 = all-left,all-right
switch = off switch = off
volume = off volume = off
[Element Line HP Swap]
switch = off
; 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]
switch = mute
volume = zero
[Element Headphone2]
switch = mute
volume = zero
[Element Speaker]
switch = mute
volume = off
[Element Desktop Speaker]
switch = mute
volume = off
[Element Front] [Element Front]
switch = mute switch = mute
volume = merge volume = merge