From 3618268757792ac5f1fe931e3c0e8ae5d2ecea83 Mon Sep 17 00:00:00 2001
From: David Henningsson <david.henningsson@canonical.com>
Date: Wed, 5 Jan 2011 13:27:53 +0100
Subject: alsa-mixer: Add new paths for Internal Mic, Front Mic, Rear Mic and
 Dock Mic

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
---
 .../mixer/paths/analog-input-internal-mic.conf     | 80 ++++++++++++++++------
 1 file changed, 60 insertions(+), 20 deletions(-)

(limited to 'src/modules/alsa/mixer/paths/analog-input-internal-mic.conf')

diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
index 70cd5129..3e45bcfb 100644
--- a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
+++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
@@ -14,54 +14,94 @@
 # along with PulseAudio; if not, write to the Free Software Foundation,
 # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
 
-; For devices where a 'Internal Mic' element exists
+; For devices where a 'Internal Mic' or 'Internal Mic Boost' element exists
+; 'Int Mic' and 'Int Mic Boost' are for compatibility with kernels < 2.6.38
 ;
 ; See analog-output.conf.common for an explanation on the directives
 
 [General]
-priority = 90
-name = analog-input-microphone
+priority = 89
+name = analog-input-microphone-internal
 
-[Element Capture]
-switch = mute
+[Element Internal Mic Boost]
+required-any = any
+switch = select
 volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
-[Element Mic]
-switch = off
-volume = off
+[Option Internal Mic Boost:on]
+name = input-boost-on
+
+[Option Internal Mic Boost:off]
+name = input-boost-off
+
+[Element Int Mic Boost]
+required-any = any
+switch = select
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
+[Option Int Mic Boost:on]
+name = input-boost-on
+
+[Option Int Mic Boost:off]
+name = input-boost-off
+
 
 [Element Internal Mic]
-required = any
+required-any = any
 switch = mute
 volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
-[Element Line]
-switch = off
-volume = off
+[Element Int Mic]
+required-any = any
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
 
-[Element Aux]
-switch = off
-volume = off
+[Element Capture]
+switch = mute
+volume = merge
+override-map.1 = all
+override-map.2 = all-left,all-right
+
+[Element Input Source]
+enumeration = select
+
+[Option Input Source:Internal Mic]
+name = analog-input-microphone-internal
+
+[Option Input Source:Int Mic]
+name = analog-input-microphone-internal
 
-[Element Video]
+[Element Capture Source]
+enumeration = select
+
+[Option Capture Source:Internal Mic]
+name = analog-input-microphone-internal
+
+[Option Capture Source:Int Mic]
+name = analog-input-microphone-internal
+
+[Element Mic]
 switch = off
 volume = off
 
-[Element Mic/Line]
+[Element Dock Mic]
 switch = off
 volume = off
 
-[Element TV Tuner]
+[Element Front Mic]
 switch = off
 volume = off
 
-[Element FM]
+[Element Rear Mic]
 switch = off
 volume = off
 
-.include analog-input.conf.common
 .include analog-input-mic.conf.common
-- 
cgit