summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2013-04-16 13:09:38 +0200
committerDavid Henningsson <david.henningsson@canonical.com>2013-04-24 07:56:01 +0200
commitd389e7d37ca603417e018d2031c09256854a8810 (patch)
tree7e1dabef1243947f90b108882491e2970638effe
parentfe73f47828294285332654801d16ffdd4e729f7e (diff)
default.pa: Load switch-on-port-available before udev-detect
We need to pick the right port as early as possible, before the first volume is picked up. Hence this module needs to be loaded before the sound card modules are loaded. Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-rwxr-xr-xsrc/daemon/default.pa.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index b4c49658..f50d9295 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -44,6 +44,9 @@ load-module module-card-restore
### stored in /usr/share/application
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
### (it's probably better to not load these drivers manually, but instead
### use module-udev-detect -- see below -- for doing this automatically)
@@ -193,8 +196,6 @@ ifelse(@HAVE_X11@, 1, [dnl
#.endif
])dnl
-load-module module-switch-on-port-available
-
### Make some devices default
#set-default-sink output
#set-default-source input