summaryrefslogtreecommitdiffstats
path: root/src/modules/alsa/mixer/paths/analog-input.conf.common
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2009-11-02 18:09:57 +0100
committerDaniel Mack <daniel@caiaq.de>2009-11-02 18:09:57 +0100
commit21ffcd55a5a425870f8f4c3b4933bc7cb352e339 (patch)
tree0c403ccb610b7155e06b8eb0d48617c957e8effb /src/modules/alsa/mixer/paths/analog-input.conf.common
parentc4e276edbd84cbb8c5b594c9f427b0a25a7fb2ab (diff)
parent7938442f77fafbc6c14d5072d14b773b289dc809 (diff)
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/alsa/mixer/paths/analog-input.conf.common')
-rw-r--r--src/modules/alsa/mixer/paths/analog-input.conf.common31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-input.conf.common b/src/modules/alsa/mixer/paths/analog-input.conf.common
index 87af38b3..951e11fa 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf.common
+++ b/src/modules/alsa/mixer/paths/analog-input.conf.common
@@ -98,7 +98,11 @@ priority = 18
name = input-docking
priority = 17
-;;; ' Capture Source'
+[Option Input Source:AUX IN]
+name = input
+priority = 10
+
+;;; 'Capture Source'
[Element Capture Source]
enumeration = select
@@ -244,6 +248,31 @@ name = input-docking
[Option Capture Source:Dock Mic]
name = input-docking-microphone
+;;; 'Mic Jack Mode'
+
+[Element Mic Jack Mode]
+enumeration = select
+
+[Option Mic Jack Mode:Mic In]
+name = input-microphone
+
+[Option Mic Jack Mode:Line In]
+name = input-linein
+
+;;; 'Digital Input Source'
+
+[Element Digital Input Source]
+enumeration = select
+
+[Option Digital Input Source:Analog Inputs]
+name = input
+
+[Option Digital Input Source:Digital Mic 1]
+name = input-microphone
+
+[Option Digital Input Source:Digital Mic 2]
+name = input-microphone
+
;;; Various Boosts
[Element Capture Boost]