According to David[1], it's unlikely that there are any sound cards that would have separate "speaker" and "desktop speaker" paths, so let's remove the unnecessary distinction. [1] http://thread.gmane.org/gmane.comp.audio.pulseaudio.general/20915/focus=21193 --- src/Makefile.am | 1 - .../mixer/paths/analog-output-desktop-speaker.conf | 102 --------------------- .../mixer/paths/analog-output-speaker-always.conf | 7 +- .../alsa/mixer/paths/analog-output-speaker.conf | 7 +- src/modules/alsa/mixer/profile-sets/default.conf | 16 ++-- .../profile-sets/force-speaker-and-int-mic.conf | 16 ++-- .../alsa/mixer/profile-sets/force-speaker.conf | 16 ++-- 7 files changed, 34 insertions(+), 131 deletions(-) delete mode 100644 src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf diff --git a/src/Makefile.am b/src/Makefile.am index 8d49af3..4219ece 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1270,7 +1270,6 @@ dist_alsapaths_DATA = \ modules/alsa/mixer/paths/analog-output-speaker.conf \ modules/alsa/mixer/paths/analog-output-speaker-always.conf \ modules/alsa/mixer/paths/analog-output.conf.common \ - 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-lineout.conf \ diff --git a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf deleted file mode 100644 index 2b68117..0000000 --- a/src/modules/alsa/mixer/paths/analog-output-desktop-speaker.conf +++ /dev/null @@ -1,102 +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. - -; Path for mixers that have a 'Desktop Speaker' control -; -; See analog-output.conf.common for an explanation on the directives - -[General] -priority = 101 -description-key = analog-output-speaker - -[Properties] -device.icon_name = audio-speakers - -[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 -override-map.2 = all-left,all-right - -[Element Master Mono] -switch = off -volume = off - -; This profile path is intended to control the desktop 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 = off -volume = off - -[Element Desktop Speaker] -required = any -switch = mute -volume = merge -override-map.1 = all -override-map.2 = all-left,all-right - -[Element Front] -switch = mute -volume = merge -override-map.1 = all-front -override-map.2 = front-left,front-right - -[Element Rear] -switch = mute -volume = merge -override-map.1 = all-rear -override-map.2 = rear-left,rear-right - -[Element Surround] -switch = mute -volume = merge -override-map.1 = all-rear -override-map.2 = rear-left,rear-right - -[Element Side] -switch = mute -volume = merge -override-map.1 = all-side -override-map.2 = side-left,side-right - -[Element Center] -switch = mute -volume = merge -override-map.1 = all-center -override-map.2 = all-center,all-center - -[Element LFE] -switch = mute -volume = merge -override-map.1 = lfe -override-map.2 = lfe,lfe - -.include analog-output.conf.common diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf index c511813..9a74068 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf @@ -68,8 +68,11 @@ override-map.1 = all override-map.2 = all-left,all-right [Element Desktop Speaker] -switch = off -volume = off +required = any +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right [Element Front] switch = mute diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf index f708e61..d3baf81 100644 --- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf +++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf @@ -81,8 +81,11 @@ override-map.1 = all override-map.2 = all-left,all-right [Element Desktop Speaker] -switch = off -volume = off +required = any +switch = mute +volume = merge +override-map.1 = all +override-map.2 = all-left,all-right [Element Front] switch = mute diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf index d0b2d48..2d2ced7 100644 --- a/src/modules/alsa/mixer/profile-sets/default.conf +++ b/src/modules/alsa/mixer/profile-sets/default.conf @@ -105,49 +105,49 @@ auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-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-headset-mic priority = 2 [Mapping analog-stereo] device-strings = front:%f hw:%f channel-map = left,right -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 +paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 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 analog-input-headset-mic priority = 10 [Mapping analog-surround-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-speaker priority = 8 direction = output [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-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-lineout analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-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-lineout analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-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-lineout analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker priority = 8 direction = output @@ -155,7 +155,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-lineout analog-output-speaker analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-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 f94a11d..b9bb44f 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,49 +24,49 @@ auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-speaker-always priority = 8 direction = output [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always priority = 8 direction = output @@ -74,7 +74,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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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 f3b7cb0..cbcaff1 100644 --- a/src/modules/alsa/mixer/profile-sets/force-speaker.conf +++ b/src/modules/alsa/mixer/profile-sets/force-speaker.conf @@ -23,49 +23,49 @@ auto-profiles = yes [Mapping analog-mono] device-strings = hw:%f channel-map = mono -paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-21] device-strings = surround21:%f channel-map = front-left,front-right,lfe -paths-output = analog-output analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-speaker-always priority = 8 direction = output [Mapping analog-surround-40] device-strings = surround40:%f channel-map = front-left,front-right,rear-left,rear-right -paths-output = analog-output analog-output-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always 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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always priority = 8 direction = output @@ -73,7 +73,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-lineout analog-output-speaker-always analog-output-desktop-speaker +paths-output = analog-output analog-output-lineout analog-output-speaker-always priority = 7 direction = output -- 1.9.3
