[PATCH] alsa-mixer: Allow speaker port to control "Front Speaker"

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

 



"Front Speaker", "Surround Speaker" seems to be a common enough name
to make it into alsa-utils, so we should probably care about it as
well. In this case, there was a macbook pro whose speakers didn't work
without these controls.

BugLink: http://bugs.launchpad.net/bugs/551441
Reported-by: Jeroen T. Vermeulen <jtv at canonical.com>
Signed-off-by: David Henningsson <david.henningsson at canonical.com>
---
 .../alsa/mixer/paths/analog-output-speaker.conf    |   30 +++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index c6916d6..0ba3e91 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -50,7 +50,7 @@ switch = mute
 volume = zero
 
 [Element Speaker]
-required = any
+required-any = any
 switch = mute
 volume = merge
 override-map.1 = all
@@ -66,6 +66,13 @@ volume = merge
 override-map.1 = all-front
 override-map.2 = front-left,front-right
 
+[Element Front Speaker]
+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
@@ -78,6 +85,13 @@ volume = merge
 override-map.1 = all-rear
 override-map.2 = rear-left,rear-right
 
+[Element Surround Speaker]
+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
@@ -90,10 +104,24 @@ volume = merge
 override-map.1 = all-center
 override-map.2 = all-center,all-center
 
+[Element Center Speaker]
+switch = mute
+volume = merge
+override-map.1 = all-center
+override-map.2 = all-center,all-center
+required-any = any
+
 [Element LFE]
 switch = mute
 volume = merge
 override-map.1 = lfe
 override-map.2 = lfe,lfe
 
+[Element LFE Speaker]
+switch = mute
+volume = merge
+override-map.1 = lfe
+override-map.2 = lfe,lfe
+required-any = any
+
 .include analog-output.conf.common
-- 
1.7.5.4



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

  Powered by Linux