summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2015-01-29 10:24:35 -0500
committerDavid Henningsson <david.henningsson@canonical.com>2015-01-29 10:24:35 -0500
commit5cc3d4aa9dc93202f329afa48fbd4227f1f80156 (patch)
treeb2982593e173053b149178a8f72b5ffb769c542a
parentf75335f25c49b2d2ff26181902c4f6f90ae7cab6 (diff)
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@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker-always.conf8
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-speaker.conf8
2 files changed, 16 insertions, 0 deletions
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 a8e5d0500..b6d9f9461 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 2c51f6c7b..39193dd88 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