Improve device switching reliability (LP: #1732629)ubuntu

2 files changed, 17 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 3459d7c..78b0ff6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pulseaudio (1:11.1-1ubuntu3) bionic; urgency=medium
+
+  * 0030-load-module-switch-on-connect.patch: Modify module load order to
+    improve device switching reliability (LP: #1732629)
+
+ -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Fri, 22 Dec 2017 17:50:58 +0800
+
 pulseaudio (1:11.1-1ubuntu2) bionic; urgency=medium
 
   * Add 0800-fix-lp1720684.patch to ensure the default Bluetooth audio
diff --git a/debian/patches/0030-load-module-switch-on-connect.patch b/debian/patches/0030-load-module-switch-on-connect.patch
index e26d08f..54f05da 100644
--- a/debian/patches/0030-load-module-switch-on-connect.patch
+++ b/debian/patches/0030-load-module-switch-on-connect.patch
@@ -2,12 +2,16 @@ Index: pulseaudio/src/daemon/default.pa.in
 ===================================================================
 --- pulseaudio.orig/src/daemon/default.pa.in
 +++ pulseaudio/src/daemon/default.pa.in
-@@ -164,3 +164,8 @@ load-module module-filter-apply
- ### Make some devices default
- #set-default-sink output
- #set-default-source input
-+
+@@ -33,7 +33,11 @@ load-module module-augment-properties
+ ### Should be after module-*-restore but before module-*-detect
+ load-module module-switch-on-port-available
+ 
+-### Load audio drivers statically
 +### Use hot-plugged devices like Bluetooth or USB automatically (LP: #1702794)
 +.ifexists module-switch-on-connect.so
 +load-module module-switch-on-connect
-+.endif
++.endif### Load audio drivers statically
++
+ ### (it's probably better to not load these drivers manually, but instead
+ ### use module-udev-detect -- see below -- for doing this automatically)
+ ifelse(@HAVE_ALSA@, 1, [dnl