[pulseaudio] 01/06: Add patch from upstream to switch back to HDMI when port is back.

[Felipe Sateler]

This is an automated email from the git hooks/post-receive script.

fsateler pushed a commit to branch master
in repository pulseaudio.

commit 36be4ebd54f39135efa33fa3227b30026ac138a3
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Mar 11 17:48:21 2016 -0300

    Add patch from upstream to switch back to HDMI when port is back.
    
    Closes: #816963
---
 debian/changelog                                   |  7 +++
 debian/patches/series                              |  1 +
 ...ort-available:-Switch-from-HDMI-to-analog.patch | 51 ++++++++++++++++++++++
 3 files changed, 59 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 23713ec..161ca27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (8.0-2) UNRELEASED; urgency=medium
+
+  * Add patch from upstream to switch back to HDMI when port is back.
+    (Closes: #816963)
+
+ -- Felipe Sateler <fsateler at debian.org>  Sat, 02 Apr 2016 19:29:18 -0300
+
 pulseaudio (8.0-1) unstable; urgency=medium
 
   [ Luke Yelavich ]
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d5a3976
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+switch-on-port-available:-Switch-from-HDMI-to-analog.patch
diff --git a/debian/patches/switch-on-port-available:-Switch-from-HDMI-to-analog.patch b/debian/patches/switch-on-port-available:-Switch-from-HDMI-to-analog.patch
new file mode 100644
index 0000000..be0c0c6
--- /dev/null
+++ b/debian/patches/switch-on-port-available:-Switch-from-HDMI-to-analog.patch
@@ -0,0 +1,51 @@
+From f6e1ac2dd2af01088fb9fea85bd57502a214335b Mon Sep 17 00:00:00 2001
+From: David Henningsson <david.henningsson at canonical.com>
+Date: Fri, 29 Jan 2016 20:33:22 +0100
+Subject: switch-on-port-available: Switch from HDMI to analog; but not the
+ other way around
+
+If you have headphones plugged in and plug in HDMI; you want sound
+to stay on headphones.
+If you have HDMI plugged in and you plug in headphones; you want sound
+to switch to headphones.
+
+Hence we need to take priority into account as well when determining
+whether to switch to a new profile or not.
+
+BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=93903
+Signed-off-by: David Henningsson <david.henningsson at canonical.com>
+
+diff --git a/src/modules/module-switch-on-port-available.c b/src/modules/module-switch-on-port-available.c
+index 5dd9786..6f4c895 100644
+--- a/src/modules/module-switch-on-port-available.c
++++ b/src/modules/module-switch-on-port-available.c
+@@ -29,7 +29,7 @@
+ 
+ #include "module-switch-on-port-available-symdef.h"
+ 
+-static bool profile_good_for_output(pa_card_profile *profile) {
++static bool profile_good_for_output(pa_card_profile *profile, unsigned prio) {
+     pa_sink *sink;
+     uint32_t idx;
+ 
+@@ -49,7 +49,7 @@ static bool profile_good_for_output(pa_card_profile *profile) {
+         if (!sink->active_port)
+             continue;
+ 
+-        if (sink->active_port->available != PA_AVAILABLE_NO)
++        if ((sink->active_port->available != PA_AVAILABLE_NO) && (sink->active_port->priority >= prio))
+             return false;
+     }
+ 
+@@ -88,7 +88,7 @@ static int try_to_switch_profile(pa_device_port *port) {
+         switch (port->direction) {
+             case PA_DIRECTION_OUTPUT:
+                 name = profile->output_name;
+-                good = profile_good_for_output(profile);
++                good = profile_good_for_output(profile, port->priority);
+                 break;
+ 
+             case PA_DIRECTION_INPUT:
+-- 
+cgit v0.10.2
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-pulseaudio/pulseaudio.git