summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2015-08-21 08:46:21 +0200
committerDavid Henningsson <david.henningsson@canonical.com>2015-08-21 13:28:32 +0200
commitc50766b52ad4cdefa51d7186389c1fb777402802 (patch)
treef382a92d561479a9d0e553609f27441f8ff3f7d3
parentfc6c9c8810c496bd260c796fb3c1ce22497cd34b (diff)
alsa-mixer: Add "Front Line Out" and "Rear Line Out"
"Front Line Out" was found in the wild on one of the machines we enable. I figured I could just as well add "Rear Line Out" too, because that's just as likely to show up. As a reminder, "Front Line Out" means "a line out jack physically located on the front side", where as "Line Out Front" means "a line out jack playing back front left and front right channels in a channel map". Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rw-r--r--src/modules/alsa/mixer/paths/analog-output-lineout.conf16
-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
3 files changed, 32 insertions, 0 deletions
diff --git a/src/modules/alsa/mixer/paths/analog-output-lineout.conf b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
index 68f444ae8..454810d8e 100644
--- a/src/modules/alsa/mixer/paths/analog-output-lineout.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-lineout.conf
@@ -33,6 +33,22 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Front Line Out]
+required-any = any
+
+[Jack Front Line Out Phantom]
+state.plugged = unknown
+state.unplugged = unknown
+required-any = any
+
+[Jack Rear Line Out]
+required-any = any
+
+[Jack Rear Line Out Phantom]
+state.plugged = unknown
+state.unplugged = unknown
+required-any = any
+
[Jack Line Out Front]
required-any = any
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 b6d9f9461..599cfc85f 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker-always.conf
@@ -41,6 +41,14 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Front Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Rear Line Out]
+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 39193dd88..ab02ad0a9 100644
--- a/src/modules/alsa/mixer/paths/analog-output-speaker.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-speaker.conf
@@ -44,6 +44,14 @@ state.unplugged = unknown
state.plugged = no
state.unplugged = unknown
+[Jack Front Line Out]
+state.plugged = no
+state.unplugged = unknown
+
+[Jack Rear Line Out]
+state.plugged = no
+state.unplugged = unknown
+
[Jack Speaker Phantom]
required-any = any
state.plugged = unknown