From dfa00bf8f846d0e1ea0f47b09d114768a781abb7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 16 Feb 2010 00:58:49 +0100 Subject: alsa: cover "Internal Mic" elements https://bugzilla.redhat.com/show_bug.cgi?id=562216 --- src/modules/alsa/mixer/paths/analog-input-aux.conf | 4 ++ src/modules/alsa/mixer/paths/analog-input-fm.conf | 4 ++ .../mixer/paths/analog-input-internal-mic.conf | 67 ++++++++++++++++++++++ .../alsa/mixer/paths/analog-input-linein.conf | 4 ++ .../alsa/mixer/paths/analog-input-mic-line.conf | 4 ++ src/modules/alsa/mixer/paths/analog-input-mic.conf | 4 ++ .../alsa/mixer/paths/analog-input-tvtuner.conf | 4 ++ .../alsa/mixer/paths/analog-input-video.conf | 4 ++ src/modules/alsa/mixer/paths/analog-input.conf | 3 + 9 files changed, 98 insertions(+) create mode 100644 src/modules/alsa/mixer/paths/analog-input-internal-mic.conf (limited to 'src/modules/alsa') diff --git a/src/modules/alsa/mixer/paths/analog-input-aux.conf b/src/modules/alsa/mixer/paths/analog-input-aux.conf index db78eb48..3a7cb7b2 100644 --- a/src/modules/alsa/mixer/paths/analog-input-aux.conf +++ b/src/modules/alsa/mixer/paths/analog-input-aux.conf @@ -32,6 +32,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-fm.conf b/src/modules/alsa/mixer/paths/analog-input-fm.conf index baf674aa..7f150e36 100644 --- a/src/modules/alsa/mixer/paths/analog-input-fm.conf +++ b/src/modules/alsa/mixer/paths/analog-input-fm.conf @@ -32,6 +32,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf new file mode 100644 index 00000000..70cd5129 --- /dev/null +++ b/src/modules/alsa/mixer/paths/analog-input-internal-mic.conf @@ -0,0 +1,67 @@ +# 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 'Internal Mic' element exists +; +; See analog-output.conf.common for an explanation on the directives + +[General] +priority = 90 +name = analog-input-microphone + +[Element Capture] +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right + +[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] +switch = off +volume = off + +[Element Aux] +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 diff --git a/src/modules/alsa/mixer/paths/analog-input-linein.conf b/src/modules/alsa/mixer/paths/analog-input-linein.conf index 4be5722d..57568ccd 100644 --- a/src/modules/alsa/mixer/paths/analog-input-linein.conf +++ b/src/modules/alsa/mixer/paths/analog-input-linein.conf @@ -31,6 +31,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] required = any switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf index f7f30854..fa680aab 100644 --- a/src/modules/alsa/mixer/paths/analog-input-mic-line.conf +++ b/src/modules/alsa/mixer/paths/analog-input-mic-line.conf @@ -32,6 +32,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-mic.conf b/src/modules/alsa/mixer/paths/analog-input-mic.conf index 2a36f2f3..9b8b75a1 100644 --- a/src/modules/alsa/mixer/paths/analog-input-mic.conf +++ b/src/modules/alsa/mixer/paths/analog-input-mic.conf @@ -35,6 +35,10 @@ volume = merge override-map.1 = all override-map.2 = all-left,all-right +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf index 8531ec70..fae3ce83 100644 --- a/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf +++ b/src/modules/alsa/mixer/paths/analog-input-tvtuner.conf @@ -32,6 +32,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input-video.conf b/src/modules/alsa/mixer/paths/analog-input-video.conf index 74c76f07..19f18099 100644 --- a/src/modules/alsa/mixer/paths/analog-input-video.conf +++ b/src/modules/alsa/mixer/paths/analog-input-video.conf @@ -31,6 +31,10 @@ override-map.2 = all-left,all-right switch = off volume = off +[Element Internal Mic] +switch = off +volume = off + [Element Line] switch = off volume = off diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf index 5055f90a..30507386 100644 --- a/src/modules/alsa/mixer/paths/analog-input.conf +++ b/src/modules/alsa/mixer/paths/analog-input.conf @@ -32,6 +32,9 @@ override-map.2 = all-left,all-right [Element Mic] required-absent = any +[Element Internal Mic] +required-absent = any + [Element Line] required-absent = any -- cgit