mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
alsa-mixer: Fixup "Mic"/"Line"/"analog-input" paths to work with the new paths
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
parent
3618268757
commit
65317c8241
4 changed files with 118 additions and 29 deletions
|
|
@ -36,12 +36,27 @@ switch = off
|
|||
volume = off
|
||||
|
||||
[Element Line]
|
||||
required = any
|
||||
required-any = any
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Input Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Input Source:Line]
|
||||
name = analog-input-linein
|
||||
required-any = any
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Line]
|
||||
name = analog-input-linein
|
||||
required-any = any
|
||||
|
||||
|
||||
[Element Aux]
|
||||
switch = off
|
||||
volume = off
|
||||
|
|
@ -62,4 +77,10 @@ volume = off
|
|||
switch = off
|
||||
volume = off
|
||||
|
||||
.include analog-input.conf.common
|
||||
[Element Mic Jack Mode]
|
||||
enumeration = select
|
||||
|
||||
[Option Mic Jack Mode:Line In]
|
||||
priority = 19
|
||||
required-any = any
|
||||
name = input-linein
|
||||
|
|
|
|||
|
|
@ -14,54 +14,89 @@
|
|||
# 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 'Mic' element exists
|
||||
; For devices where a 'Mic' or 'Mic Boost' element exists
|
||||
;
|
||||
; See analog-output.conf.common for an explanation on the directives
|
||||
|
||||
[General]
|
||||
priority = 100
|
||||
priority = 89
|
||||
name = analog-input-microphone
|
||||
|
||||
[Element Mic Boost]
|
||||
required-any = any
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Option Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Mic]
|
||||
required-any = any
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Capture]
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Mic]
|
||||
required = any
|
||||
switch = mute
|
||||
[Element Input Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Input Source:Mic]
|
||||
name = analog-input-microphone
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Mic]
|
||||
name = analog-input-microphone
|
||||
|
||||
;;; Some AC'97s have "Mic Select" and "Mic Boost (+20dB)"
|
||||
|
||||
[Element Mic Select]
|
||||
enumeration = select
|
||||
|
||||
[Option Mic Select:Mic1]
|
||||
name = input-microphone
|
||||
priority = 20
|
||||
|
||||
[Option Mic Select:Mic2]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
|
||||
[Element Mic Boost (+20dB)]
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Option Mic Boost (+20dB):on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Mic Boost (+20dB):off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Front Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Internal Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Line]
|
||||
[Element Rear Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Aux]
|
||||
[Element Dock Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Video]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Mic/Line]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element TV Tuner]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element FM]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
.include analog-input.conf.common
|
||||
.include analog-input-mic.conf.common
|
||||
|
|
|
|||
|
|
@ -41,3 +41,10 @@ volume = off
|
|||
[Element FM]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Mic Jack Mode]
|
||||
enumeration = select
|
||||
|
||||
[Option Mic Jack Mode:Mic In]
|
||||
priority = 19
|
||||
name = input-microphone
|
||||
|
|
|
|||
|
|
@ -32,9 +32,36 @@ override-map.2 = all-left,all-right
|
|||
[Element Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Dock Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Dock Mic Boost]
|
||||
required-absent = any
|
||||
|
||||
[Element Front Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Front Mic Boost]
|
||||
required-absent = any
|
||||
|
||||
[Element Int Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Int Mic Boost]
|
||||
required-absent = any
|
||||
|
||||
[Element Internal Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Internal Mic Boost]
|
||||
required-absent = any
|
||||
|
||||
[Element Rear Mic]
|
||||
required-absent = any
|
||||
|
||||
[Element Rear Mic Boost]
|
||||
required-absent = any
|
||||
|
||||
[Element Line]
|
||||
required-absent = any
|
||||
|
||||
|
|
@ -54,4 +81,3 @@ required-absent = any
|
|||
required-absent = any
|
||||
|
||||
.include analog-input.conf.common
|
||||
.include analog-input-mic.conf.common
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue