diff options
| author | Daniel Mack <daniel@caiaq.de> | 2009-11-02 18:09:57 +0100 |
|---|---|---|
| committer | Daniel Mack <daniel@caiaq.de> | 2009-11-02 18:09:57 +0100 |
| commit | 21ffcd55a5a425870f8f4c3b4933bc7cb352e339 (patch) | |
| tree | 0c403ccb610b7155e06b8eb0d48617c957e8effb /src/modules/alsa/mixer/paths/analog-output.conf | |
| parent | c4e276edbd84cbb8c5b594c9f427b0a25a7fb2ab (diff) | |
| parent | 7938442f77fafbc6c14d5072d14b773b289dc809 (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio
Diffstat (limited to 'src/modules/alsa/mixer/paths/analog-output.conf')
| -rw-r--r-- | src/modules/alsa/mixer/paths/analog-output.conf | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output.conf b/src/modules/alsa/mixer/paths/analog-output.conf index f71a05a1..d7c1223b 100644 --- a/src/modules/alsa/mixer/paths/analog-output.conf +++ b/src/modules/alsa/mixer/paths/analog-output.conf @@ -14,12 +14,13 @@ # along with PulseAudio; if not, write to the Free Software Foundation, # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. -; Intended for the 'default' output +; Intended for the 'default' output. Note that a-o-speaker.conf has a +; higher priority than this ; ; See analog-output.conf.common for an explanation on the directives [General] -priority = 100 +priority = 99 [Element Hardware Master] switch = mute @@ -37,18 +38,20 @@ override-map.2 = all-left,all-right switch = off volume = off -; This profile path is intended to control the speaker, not the +; This profile path is intended to control the default output, 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 +volume = off [Element Front] switch = mute |