[pulseaudio-commits] src/modules

[David Henningsson]

 src/modules/alsa/mixer/paths/analog-output-speaker-always.conf |    8 ++++++++
 src/modules/alsa/mixer/paths/analog-output-speaker.conf        |    8 ++++++++
 2 files changed, 16 insertions(+)

New commits:
commit 5cc3d4aa9dc93202f329afa48fbd4227f1f80156
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Thu Jan 29 10:24:35 2015 -0500

    alsa-mixer: Make speaker unavailable when Line Out is plugged in
    
    ALSA mutes speaker when Line Out is plugged in by default, so
    we should follow that convention.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

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 a8e5d05..b6d9f94 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -33,6 +33,14 @@ state.unplugged = unknown
 state.plugged = no
 state.unplugged = unknown
 
+[Jack Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Line Out Front]
+state.plugged = no
+state.unplugged = unknown
+
 [Element Hardware Master]
 switch = mute
 volume = merge
diff --git a/src/modules/alsa/mixer/paths/analog-output-speaker.conf b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
index 2c51f6c..39193dd 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -36,6 +36,14 @@ state.unplugged = unknown
 state.plugged = no
 state.unplugged = unknown
 
+[Jack Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Line Out Front]
+state.plugged = no
+state.unplugged = unknown
+
 [Jack Speaker Phantom]
 required-any = any
 state.plugged = unknown