[PATCH 2/2] alsa-mixer: Ignore some elements in the analog-output path

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 




On 2014-08-17 13:52, 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.

Removing the "Jack" ones should be okay, because they're required-any in 
lineout.conf, so if these elements exist, there is always a "Line Out".

I'm not sure about removing the elements. Could there be hardware where 
we don't have anything making analog-output-speaker.conf show up, and we 
still want the control over the things you remove below in 
analog-output.conf?

> ---
>   src/modules/alsa/mixer/paths/analog-output.conf | 34 -------------------------
>   1 file changed, 34 deletions(-)
>
> diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf
> index 3a552c9..5279d74 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
> @@ -42,32 +34,6 @@ volume = merge
>   override-map.1 = all
>   override-map.2 = all-left,all-right
>
> -[Element Master Mono]
> -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
>

-- 
David Henningsson, Canonical Ltd.
https://launchpad.net/~diwic


[Index of Archives]     [Linux Audio Users]     [AMD Graphics]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux