[pulseaudio-discuss] [PATCH] alsa-mixer: Ignore some elements in the analog-output path

[Tanu Kaskinen]

On Fri, 2014-10-31 at 13:12 +0100, David Henningsson wrote:
> Ack!

Thanks! Pushed.

-- Tanu

> On 2014-10-27 12:00, Tanu Kaskinen wrote:
> > 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
> > ---
> >
> > Changes in v2: do not remove Element Master Mono, because
> > analog-output should not be a subset of analog-output-mono.
> >
> >
> >   src/modules/alsa/mixer/paths/analog-output.conf | 30 -------------------------
> >   1 file changed, 30 deletions(-)
> >
> > diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
> > index 3a552c9..4f9cc53 100644
> > --- a/src/modules/alsa/mixer/paths/analog-output.conf
> > +++ b/src/modules/alsa/mixer/paths/analog-output.conf
> > @@ -22,14 +22,6 @@
> >   [General]
> >   priority = 99
> >
> > -[Jack Line Out]
> > -state.plugged = unknown
> > -state.unplugged = unknown
> > -
> > -[Jack Line Out Phantom]
> > -state.plugged = unknown
> > -state.unplugged = unknown
> > -
> >   [Element Hardware Master]
> >   switch = mute
> >   volume = merge
> > @@ -46,28 +38,6 @@ override-map.2 = all-left,all-right
> >   switch = 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]
> >   switch = mute
> >   volume = merge
> >
>