mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-07 13:30:03 -05:00
alsa-mixer: Add new paths for Internal Mic, Front Mic, Rear Mic and Dock Mic
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
This commit is contained in:
David Henningsson
Colin Guthrie
parent
ade0a6f884
commit
3618268757
7 changed files with 327 additions and 85 deletions
79
src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
Normal file
79
src/modules/alsa/mixer/paths/analog-input-dock-mic.conf
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# This file is part of PulseAudio.
|
||||
#
|
||||
# PulseAudio is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as
|
||||
# published by the Free Software Foundation; either version 2.1 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# PulseAudio is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# 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 'Dock Mic' or 'Dock Mic Boost' element exists
|
||||
;
|
||||
; See analog-output.conf.common for an explanation on the directives
|
||||
|
||||
[General]
|
||||
priority = 80
|
||||
name = analog-input-microphone-dock
|
||||
|
||||
[Element Dock Mic Boost]
|
||||
required-any = any
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Option Dock Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Dock Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Dock 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 Input Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Input Source:Dock Mic]
|
||||
name = analog-input-microphone-dock
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Dock Mic]
|
||||
name = analog-input-microphone-dock
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Internal Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Front Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Rear Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
.include analog-input-mic.conf.common
|
||||
79
src/modules/alsa/mixer/paths/analog-input-front-mic.conf
Normal file
79
src/modules/alsa/mixer/paths/analog-input-front-mic.conf
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# This file is part of PulseAudio.
|
||||
#
|
||||
# PulseAudio is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as
|
||||
# published by the Free Software Foundation; either version 2.1 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# PulseAudio is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# 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 'Front Mic' or 'Front Mic Boost' element exists
|
||||
;
|
||||
; See analog-output.conf.common for an explanation on the directives
|
||||
|
||||
[General]
|
||||
priority = 90
|
||||
name = analog-input-microphone-front
|
||||
|
||||
[Element Front Mic Boost]
|
||||
required-any = any
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Option Front Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Front Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Front 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 Input Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Input Source:Front Mic]
|
||||
name = analog-input-microphone-front
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Front Mic]
|
||||
name = analog-input-microphone-front
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Internal Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Rear Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Dock Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
.include analog-input-mic.conf.common
|
||||
|
|
@ -14,13 +14,55 @@
|
|||
# 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 Internal Mic Boost]
|
||||
required-any = any
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[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 = any
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Int Mic]
|
||||
required-any = any
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Capture]
|
||||
switch = mute
|
||||
|
|
@ -28,40 +70,38 @@ 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 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 Internal Mic]
|
||||
required = any
|
||||
switch = mute
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Element Line]
|
||||
[Element Dock Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Aux]
|
||||
[Element Front Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Video]
|
||||
[Element Rear Mic]
|
||||
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
|
||||
|
|
|
|||
|
|
@ -18,64 +18,26 @@
|
|||
;
|
||||
; See analog-output.conf.common for an explanation on the directives
|
||||
|
||||
;;; 'Mic Select'
|
||||
[Element Line]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Mic Select]
|
||||
enumeration = select
|
||||
[Element Aux]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Option Mic Select:Mic1]
|
||||
name = input-microphone
|
||||
priority = 20
|
||||
[Element Video]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Option Mic Select:Mic2]
|
||||
name = input-microphone
|
||||
priority = 19
|
||||
[Element Mic/Line]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
;;; Various Boosts
|
||||
[Element TV Tuner]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Mic Boost (+20dB)]
|
||||
switch = select
|
||||
volume = merge
|
||||
|
||||
[Option Mic Boost (+20dB):on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Mic Boost (+20dB):off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Mic Boost]
|
||||
switch = select
|
||||
volume = merge
|
||||
|
||||
[Option Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Front Mic Boost]
|
||||
switch = select
|
||||
|
||||
[Option Front Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Front Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Rear Mic Boost]
|
||||
switch = select
|
||||
|
||||
[Option Rear Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Rear Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Int Mic Boost]
|
||||
switch = select
|
||||
|
||||
[Option Int Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Int Mic Boost:off]
|
||||
name = input-boost-off
|
||||
[Element FM]
|
||||
switch = off
|
||||
volume = off
|
||||
|
|
|
|||
79
src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
Normal file
79
src/modules/alsa/mixer/paths/analog-input-rear-mic.conf
Normal file
|
|
@ -0,0 +1,79 @@
|
|||
# This file is part of PulseAudio.
|
||||
#
|
||||
# PulseAudio is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Lesser General Public License as
|
||||
# published by the Free Software Foundation; either version 2.1 of the
|
||||
# License, or (at your option) any later version.
|
||||
#
|
||||
# PulseAudio is distributed in the hope that it will be useful, but
|
||||
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
# General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU Lesser General Public License
|
||||
# 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 'Rear Mic' or 'Rear Mic Boost' element exists
|
||||
;
|
||||
; See analog-output.conf.common for an explanation on the directives
|
||||
|
||||
[General]
|
||||
priority = 89
|
||||
name = analog-input-microphone-rear
|
||||
|
||||
[Element Rear Mic Boost]
|
||||
required-any = any
|
||||
switch = select
|
||||
volume = merge
|
||||
override-map.1 = all
|
||||
override-map.2 = all-left,all-right
|
||||
|
||||
[Option Rear Mic Boost:on]
|
||||
name = input-boost-on
|
||||
|
||||
[Option Rear Mic Boost:off]
|
||||
name = input-boost-off
|
||||
|
||||
[Element Rear 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 Input Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Input Source:Rear Mic]
|
||||
name = analog-input-microphone-rear
|
||||
|
||||
[Element Capture Source]
|
||||
enumeration = select
|
||||
|
||||
[Option Capture Source:Rear Mic]
|
||||
name = analog-input-microphone-rear
|
||||
|
||||
[Element Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Internal Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Front Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
[Element Dock Mic]
|
||||
switch = off
|
||||
volume = off
|
||||
|
||||
.include analog-input-mic.conf.common
|
||||
|
|
@ -63,14 +63,14 @@ auto-profiles = yes
|
|||
device-strings = hw:%f
|
||||
channel-map = mono
|
||||
paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
|
||||
paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
|
||||
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
|
||||
priority = 1
|
||||
|
||||
[Mapping analog-stereo]
|
||||
device-strings = front:%f hw:%f
|
||||
channel-map = left,right
|
||||
paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono
|
||||
paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
|
||||
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line
|
||||
priority = 10
|
||||
|
||||
[Mapping analog-surround-40]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue