mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa-mixer: Make sure capture source and input source use right path

Browse source 
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:
David Henningsson 2011-01-19 15:40:56 +01:00 • committed by Colin Guthrie
parent 65317c8241
commit dbdb4607b0
6 changed files with 12 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
View file

@ -53,12 +53,14 @@ enumeration = select
[Option Input Source:Dock Mic] [Option Input Source:Dock Mic]
name = analog-input-microphone-dock name = analog-input-microphone-dock
required-any = any
[Element Capture Source] [Element Capture Source]
enumeration = select enumeration = select
[Option Capture Source:Dock Mic] [Option Capture Source:Dock Mic]
name = analog-input-microphone-dock name = analog-input-microphone-dock
required-any = any
[Element Mic] [Element Mic]
switch = off switch = off

2
src/modules/alsa/mixer/paths/analog-input-front-mic.conf
View file

@ -53,12 +53,14 @@ enumeration = select
[Option Input Source:Front Mic] [Option Input Source:Front Mic]
name = analog-input-microphone-front name = analog-input-microphone-front
required-any = any
[Element Capture Source] [Element Capture Source]
enumeration = select enumeration = select
[Option Capture Source:Front Mic] [Option Capture Source:Front Mic]
name = analog-input-microphone-front name = analog-input-microphone-front
required-any = any
[Element Mic] [Element Mic]
switch = off switch = off

4
src/modules/alsa/mixer/paths/analog-input-internal-mic.conf
View file

@ -75,18 +75,22 @@ enumeration = select
[Option Input Source:Internal Mic] [Option Input Source:Internal Mic]
name = analog-input-microphone-internal name = analog-input-microphone-internal
required-any = any
[Option Input Source:Int Mic] [Option Input Source:Int Mic]
name = analog-input-microphone-internal name = analog-input-microphone-internal
required-any = any
[Element Capture Source] [Element Capture Source]
enumeration = select enumeration = select
[Option Capture Source:Internal Mic] [Option Capture Source:Internal Mic]
name = analog-input-microphone-internal name = analog-input-microphone-internal
required-any = any
[Option Capture Source:Int Mic] [Option Capture Source:Int Mic]
name = analog-input-microphone-internal name = analog-input-microphone-internal
required-any = any
[Element Mic] [Element Mic]
switch = off switch = off

2
src/modules/alsa/mixer/paths/analog-input-mic.conf
View file

@ -53,12 +53,14 @@ enumeration = select
[Option Input Source:Mic] [Option Input Source:Mic]
name = analog-input-microphone name = analog-input-microphone
required-any = any
[Element Capture Source] [Element Capture Source]
enumeration = select enumeration = select
[Option Capture Source:Mic] [Option Capture Source:Mic]
name = analog-input-microphone name = analog-input-microphone
required-any = any
;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)" ;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)"

2
src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
View file

@ -53,12 +53,14 @@ enumeration = select
[Option Input Source:Rear Mic] [Option Input Source:Rear Mic]
name = analog-input-microphone-rear name = analog-input-microphone-rear
required-any = any
[Element Capture Source] [Element Capture Source]
enumeration = select enumeration = select
[Option Capture Source:Rear Mic] [Option Capture Source:Rear Mic]
name = analog-input-microphone-rear name = analog-input-microphone-rear
required-any = any
[Element Mic] [Element Mic]
switch = off switch = off

45
src/modules/alsa/mixer/paths/analog-input.conf.common
View file

@ -66,42 +66,18 @@ enumeration = select
name = input-microphone name = input-microphone
priority = 20 priority = 20
[Option Input Source:Mic]
name = input-microphone
priority = 20
[Option Input Source:Microphone] [Option Input Source:Microphone]
name = input-microphone name = input-microphone
priority = 20 priority = 20
[Option Input Source:Front Mic]
name = input-microphone
priority = 19
[Option Input Source:Front Microphone] [Option Input Source:Front Microphone]
name = input-microphone name = input-microphone
priority = 19 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] [Option Input Source:Internal Mic 1]
name = input-microphone name = input-microphone
priority = 19 priority = 19
[Option Input Source:Line]
name = input-linein
priority = 18
[Option Input Source:Line-In] [Option Input Source:Line-In]
name = input-linein name = input-linein
priority = 18 priority = 18
@ -135,21 +111,12 @@ name = input
[Option Capture Source:Line/Mic] [Option Capture Source:Line/Mic]
name = input name = input
[Option Capture Source:Mic]
name = input-microphone
[Option Capture Source:Microphone] [Option Capture Source:Microphone]
name = input-microphone name = input-microphone
[Option Capture Source:Int Mic]
name = input-microphone-internal
[Option Capture Source:Int DMic] [Option Capture Source:Int DMic]
name = input-microphone-internal name = input-microphone-internal
[Option Capture Source:Internal Mic]
name = input-microphone-internal
[Option Capture Source:iMic] [Option Capture Source:iMic]
name = input-microphone-internal name = input-microphone-internal
@ -159,15 +126,9 @@ name = input-microphone-internal
[Option Capture Source:Internal Microphone] [Option Capture Source:Internal Microphone]
name = input-microphone-internal name = input-microphone-internal
[Option Capture Source:Front Mic]
name = input-microphone
[Option Capture Source:Front Microphone] [Option Capture Source:Front Microphone]
name = input-microphone name = input-microphone
[Option Capture Source:Rear Mic]
name = input-microphone
[Option Capture Source:Mic1] [Option Capture Source:Mic1]
name = input-microphone name = input-microphone
@ -198,9 +159,6 @@ name = input-linein
[Option Capture Source:Analog] [Option Capture Source:Analog]
name = input name = input
[Option Capture Source:Line]
name = input-linein
[Option Capture Source:Line-In] [Option Capture Source:Line-In]
name = input-linein name = input-linein
@ -261,9 +219,6 @@ name = input
[Option Capture Source:Docking-Station] [Option Capture Source:Docking-Station]
name = input-docking name = input-docking
[Option Capture Source:Dock Mic]
name = input-docking-microphone
;;; 'Mic Jack Mode' ;;; 'Mic Jack Mode'
[Element Mic Jack Mode] [Element Mic Jack Mode]