[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-220-g220ac0a

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  430e8e2ee52235f59b015e8e4a3aff9b4abd28b8 (commit)

- Log -----------------------------------------------------------------
220ac0a alsa: cover Headphone2 mixer element
-----------------------------------------------------------------------

Summary of changes:
 src/Makefile.am                                    |    1 +
 ...phones.conf => analog-output-headphones-2.conf} |    6 +++++-
 .../alsa/mixer/paths/analog-output-headphones.conf |    4 ++++
 src/modules/alsa/mixer/profile-sets/default.conf   |    4 ++--
 4 files changed, 12 insertions(+), 3 deletions(-)
 copy src/modules/alsa/mixer/paths/{analog-output-headphones.conf => analog-output-headphones-2.conf} (94%)

-----------------------------------------------------------------------

commit 220ac0a61a1f3b310a9c49153c56a395ac701e89
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Oct 31 03:10:00 2009 +0100

    alsa: cover Headphone2 mixer element
    
    As seen on some drivers:
    
    https://bugzilla.redhat.com/show_bug.cgi?id=498612

diff --git a/src/Makefile.am b/src/Makefile.am
index 98c0468..aa71d91 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -143,6 +143,7 @@ EXTRA_DIST = \
 		modules/alsa/mixer/paths/analog-output.conf \
 		modules/alsa/mixer/paths/analog-output.conf.common \
 		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
 
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
similarity index 94%
copy from src/modules/alsa/mixer/paths/analog-output-headphones.conf
copy to src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
index 61d2e29..8b2968e 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
@@ -14,7 +14,7 @@
 # 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 'Headphone' control
+; Path for mixers that have a 'Headphone2' control
 ;
 ; See analog-output.conf.common for an explanation on the directives
 
@@ -38,6 +38,10 @@ switch = off
 volume = off
 
 [Element Headphone]
+switch = off
+volume = off
+
+[Element Headphone2]
 required = any
 switch = mute
 volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 61d2e29..6e79a78 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -44,6 +44,10 @@ volume = merge
 override-map.1 = all
 override-map.2 = all-left,all-right
 
+[Element Headphone2]
+switch = off
+volume = off
+
 [Element Speaker]
 switch = off
 volume = off
diff --git a/src/modules/alsa/mixer/profile-sets/default.conf b/src/modules/alsa/mixer/profile-sets/default.conf
index ac41a8d..ffa1a4f 100644
--- a/src/modules/alsa/mixer/profile-sets/default.conf
+++ b/src/modules/alsa/mixer/profile-sets/default.conf
@@ -62,14 +62,14 @@ auto-profiles = yes
 [Mapping analog-mono]
 device-strings = hw:%f
 channel-map = mono
-paths-output = analog-output analog-output-headphones analog-output-mono analog-output-lfe-on-mono
+paths-output = analog-output 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
 priority = 1
 
 [Mapping analog-stereo]
 device-strings = front:%f hw:%f
 channel-map = left,right
-paths-output = analog-output analog-output-headphones analog-output-mono analog-output-lfe-on-mono
+paths-output = analog-output 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
 priority = 10
 

-- 
hooks/post-receive
PulseAudio Sound Server