mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
alsa-mixer: Make sure capture source and input source use right path
Make sure that mic and line (with common names) use the specific path instead of the analog-input one. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
parent
65317c8241
commit
dbdb4607b0
6 changed files with 12 additions and 45 deletions
|
|
@ -53,12 +53,14 @@ enumeration = select
|
|||
|
||||
[Option Input Source:Dock Mic]
|
||||
name = analog-input-microphone-dock
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Dock Mic]
|
||||
name = analog-input-microphone-dock
|
||||
required-any = any
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
|
|
|
|||
|
|
@ -53,12 +53,14 @@ enumeration = select
|
|||
|
||||
[Option Input Source:Front Mic]
|
||||
name = analog-input-microphone-front
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Front Mic]
|
||||
name = analog-input-microphone-front
|
||||
required-any = any
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
|
|
|
|||
|
|
@ -75,18 +75,22 @@ enumeration = select
|
|||
|
||||
[Option Input Source:Internal Mic]
|
||||
name = analog-input-microphone-internal
|
||||
required-any = any
|
||||
|
||||
[Option Input Source:Int Mic]
|
||||
name = analog-input-microphone-internal
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Internal Mic]
|
||||
name = analog-input-microphone-internal
|
||||
required-any = any
|
||||
|
||||
[Option Capture Source:Int Mic]
|
||||
name = analog-input-microphone-internal
|
||||
required-any = any
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
|
|
|
|||
|
|
@ -53,12 +53,14 @@ enumeration = select
|
|||
|
||||
[Option Input Source:Mic]
|
||||
name = analog-input-microphone
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Mic]
|
||||
name = analog-input-microphone
|
||||
required-any = any
|
||||
|
||||
;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)"
|
||||
|
||||
|
|
|
|||
|
|
@ -53,12 +53,14 @@ enumeration = select
|
|||
|
||||
[Option Input Source:Rear Mic]
|
||||
name = analog-input-microphone-rear
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Rear Mic]
|
||||
name = analog-input-microphone-rear
|
||||
required-any = any
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
|
|
|
|||
|
|
@ -66,42 +66,18 @@ enumeration = select
|
|||
name = input-microphone
|
||||
priority = 20
|
||||
|
||||
[Option Input Source:Mic]
|
||||
name = input-microphone
|
||||
priority = 20
|
||||
|
||||
[Option Input Source:Microphone]
|
||||
name = input-microphone
|
||||
priority = 20
|
||||
|
||||
[Option Input Source:Front Mic]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Front Microphone]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Int Mic]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Internal Mic]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Rear Mic]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Internal Mic 1]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Option Input Source:Line]
|
||||
name = input-linein
|
||||
priority = 18
|
||||
|
||||
[Option Input Source:Line-In]
|
||||
name = input-linein
|
||||
priority = 18
|
||||
|
|
@ -135,21 +111,12 @@ name = input
|
|||
[Option Capture Source:Line/Mic]
|
||||
name = input
|
||||
|
||||
[Option Capture Source:Mic]
|
||||
name = input-microphone
|
||||
|
||||
[Option Capture Source:Microphone]
|
||||
name = input-microphone
|
||||
|
||||
[Option Capture Source:Int Mic]
|
||||
name = input-microphone-internal
|
||||
|
||||
[Option Capture Source:Int DMic]
|
||||
name = input-microphone-internal
|
||||
|
||||
[Option Capture Source:Internal Mic]
|
||||
name = input-microphone-internal
|
||||
|
||||
[Option Capture Source:iMic]
|
||||
name = input-microphone-internal
|
||||
|
||||
|
|
@ -159,15 +126,9 @@ name = input-microphone-internal
|
|||
[Option Capture Source:Internal Microphone]
|
||||
name = input-microphone-internal
|
||||
|
||||
[Option Capture Source:Front Mic]
|
||||
name = input-microphone
|
||||
|
||||
[Option Capture Source:Front Microphone]
|
||||
name = input-microphone
|
||||
|
||||
[Option Capture Source:Rear Mic]
|
||||
name = input-microphone
|
||||
|
||||
[Option Capture Source:Mic1]
|
||||
name = input-microphone
|
||||
|
||||
|
|
@ -198,9 +159,6 @@ name = input-linein
|
|||
[Option Capture Source:Analog]
|
||||
name = input
|
||||
|
||||
[Option Capture Source:Line]
|
||||
name = input-linein
|
||||
|
||||
[Option Capture Source:Line-In]
|
||||
name = input-linein
|
||||
|
||||
|
|
@ -261,9 +219,6 @@ name = input
|
|||
[Option Capture Source:Docking-Station]
|
||||
name = input-docking
|
||||
|
||||
[Option Capture Source:Dock Mic]
|
||||
name = input-docking-microphone
|
||||
|
||||
;;; 'Mic Jack Mode'
|
||||
|
||||
[Element Mic Jack Mode]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue