These kcontrol names have started to show up lately, in combination with surround internal speakers. BugLink: https://bugs.launchpad.net/bugs/1236965 Signed-off-by: David Henningsson <david.henningsson at canonical.com> --- .../alsa/mixer/paths/analog-output-headphones.conf | 16 ++++++++++ .../alsa/mixer/paths/analog-output-lineout.conf | 16 ++++++++++ .../alsa/mixer/paths/analog-output-speaker.conf | 31 ++++++++++++++++++++ 3 files changed, 63 insertions(+) Changes since v1: Added muting of these paths on headphone/line-out plugged in. diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf index e682033..b1a349a 100644 --- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf +++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf @@ -118,4 +118,20 @@ volume = off switch = off volume = off +[Element Speaker Front] +switch = off +volume = off + +[Element Speaker Surround] +switch = off +volume = off + +[Element Speaker Side] +switch = off +volume = off + +[Element Speaker CLFE] +switch = off +volume = off + .include analog-output.conf.common diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf index b8595f7..3d0e7c2 100644 --- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf +++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf @@ -144,4 +144,20 @@ volume = merge override-map.1 = all-center override-map.2 = all-center,lfe +[Element Speaker Front] +switch = off +volume = off + +[Element Speaker Surround] +switch = off +volume = off + +[Element Speaker Side] +switch = off +volume = off + +[Element Speaker CLFE] +switch = off +volume = off + .include analog-output.conf.common diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf index ccd438f..d79fad1 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf @@ -38,6 +38,11 @@ required-any = any state.plugged = unknown state.unplugged = unknown +[Jack Speaker Front Phantom] +required-any = any +state.plugged = unknown +state.unplugged = unknown + [Element Hardware Master] switch = mute volume = merge @@ -88,6 +93,13 @@ override-map.1 = all-front override-map.2 = front-left,front-right required-any = any +[Element Speaker Front] +switch = mute +volume = merge +override-map.1 = all-front +override-map.2 = front-left,front-right +required-any = any + [Element Rear] switch = mute volume = merge @@ -107,12 +119,25 @@ override-map.1 = all-rear override-map.2 = rear-left,rear-right required-any = any +[Element Speaker Surround] +switch = mute +volume = merge +override-map.1 = all-rear +override-map.2 = rear-left,rear-right +required-any = any + [Element Side] switch = mute volume = merge override-map.1 = all-side override-map.2 = side-left,side-right +[Element Speaker Side] +switch = mute +volume = merge +override-map.1 = all-side +override-map.2 = side-left,side-right + [Element Center] switch = mute volume = merge @@ -152,4 +177,10 @@ volume = merge override-map.1 = all-center override-map.2 = all-center,lfe +[Element Speaker CLFE] +switch = mute +volume = merge +override-map.1 = all-center +override-map.2 = all-center,lfe + .include analog-output.conf.common -- 1.7.9.5
