From ba0203c4c0938fd646cf559456e3d691fc889029 Mon Sep 17 00:00:00 2001 From: David Henningsson Date: Thu, 4 Oct 2012 13:32:35 +0200 Subject: [PATCH] alsa-mixer: Remove analog-output-lfe-on-mono MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstreamed from Debian: "Although in principle Ac '97 hardware has a separate mono LFE pin nothing seems to use it. To make matters worse it does confuse PulseAudio's port selection slightly which causes audio in virtualbox not to work out of the box." Credit: Sjoerd Simons Credit: Martin-Éric Racine BugLink: https://bugs.launchpad.net/bugs/1016969 BugLink: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673847 Signed-off-by: David Henningsson --- src/Makefile.am | 1 - .../paths/analog-output-lfe-on-mono.conf | 89 ------------------- .../alsa/mixer/profile-sets/default.conf | 14 +-- .../alsa/mixer/profile-sets/extra-hdmi.conf | 14 +-- .../force-speaker-and-int-mic.conf | 14 +-- .../mixer/profile-sets/force-speaker.conf | 14 +-- 6 files changed, 28 insertions(+), 118 deletions(-) delete mode 100644 src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf diff --git a/src/Makefile.am b/src/Makefile.am index 8a7161dd4..56907669c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1157,7 +1157,6 @@ dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-output-desktop-speaker.conf \ modules/alsa/mixer/paths/analog-output-headphones.conf \ modules/alsa/mixer/paths/analog-output-headphones-2.conf \ - modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf \ modules/alsa/mixer/paths/analog-output-mono.conf \ modules/alsa/mixer/paths/iec958-stereo-output.conf \ modules/alsa/mixer/paths/hdmi-output-0.conf \ diff --git a/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf b/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf deleted file mode 100644 index 181aa3885..000000000 --- a/src/modules/alsa/mixer/paths/analog-output-lfe-on-mono.conf +++ /dev/null @@ -1,89 +0,0 @@ -# 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. - -; Intended for usage in laptops that have a separate LFE speaker -; connected to the Master mono connector -; -; See analog-output.conf.common for an explanation on the directives - -[General] -priority = 40 - -[Element Hardware Master] -switch = mute -volume = merge -override-map.1 = all -override-map.2 = all-left,all-right - -[Element Master] -switch = mute -volume = merge -override-map.1 = all-no-lfe -override-map.2 = all-left,all-right - -[Element Master Mono] -required = any -switch = mute -volume = merge -override-map.1 = lfe -override-map.2 = lfe,lfe - -; This profile path is intended to control the speaker, not the -; headphones. But it should not hurt if we leave the headphone jack -; enabled nonetheless. -[Element Headphone] -switch = mute -volume = zero - -[Element Headphone2] -switch = mute -volume = zero - -[Element Speaker] -switch = mute -volume = merge -override-map.1 = all -override-map.2 = all-left,all-right - -[Element Desktop Speaker] -switch = off -volume = off - -[Element Front] -switch = off -volume = off - -[Element Rear] -switch = off -volume = off - -[Element Surround] -switch = off -volume = off - -[Element Side] -switch = off -volume = off - -[Element Center] -switch = off -volume = off - -[Element LFE] -switch = off -volume = off - -.include analog-output.conf.common diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index b75feed65..b040036a6 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -101,42 +101,42 @@ auto-profiles = yes [Mapping analog-mono] 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-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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 analog-input-headphone-mic priority = 10 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output @@ -144,7 +144,7 @@ direction = output device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output diff --git a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf index 06b07c0d1..707531450 100644 --- a/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf +++ b/src/modules/alsa/mixer/profile-sets/extra-hdmi.conf @@ -27,42 +27,42 @@ auto-profiles = yes [Mapping analog-mono] 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-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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 analog-input-headphone-mic priority = 10 [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 8 direction = output @@ -70,7 +70,7 @@ direction = output device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker analog-output-desktop-speaker priority = 7 direction = output diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf index a7250e20f..2095cf93d 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf @@ -24,42 +24,42 @@ auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic-always 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-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic-always 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] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output @@ -67,7 +67,7 @@ direction = output device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output diff --git a/src/modules/alsa/mixer/profile-sets/force-speaker.conf b/src/modules/alsa/mixer/profile-sets/force-speaker.conf index 662ddeaf7..f03ada64d 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf @@ -23,42 +23,42 @@ auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono 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] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-41] device-strings = surround41:%f channel-map = front-left,front-right,rear-left,rear-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output [Mapping analog-surround-50] device-strings = surround50:%f channel-map = front-left,front-right,rear-left,rear-right,front-center -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output [Mapping analog-surround-51] device-strings = surround51:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 8 direction = output @@ -66,7 +66,7 @@ direction = output device-strings = surround71:%f channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right description = Analog Surround 7.1 -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker analog-output-lfe-on-mono +paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker priority = 7 direction = output