[pulseaudio-commits] src/daemon

[Arun Raghavan]

 src/daemon/default.pa.in |   17 +++++++++++------
 src/daemon/system.pa.in  |   14 +++++++++-----
 2 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 766dbc68388eed786f00524517cfe67c1b1585c2
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Sep 14 14:55:07 2011 +0200

    conf: Make sure module-dbus-protocol is loaded after module-default-device-restore
    
    module-dbus-protocol gets the default sink, which sets the default sink
    if not already set. This is turn makes module-default-device-restore do
    nothing.
    To solve the problem, make sure module-default-device-restore is loaded
    before module-dbus-protocol and not the other way around.
    
    BugLink: http://bugs.launchpad.net/bugs/843780
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 6155b31..57f259c 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -98,11 +98,6 @@ load-module module-esound-protocol-unix
 .endif
 load-module module-native-protocol-unix
 ])dnl
-ifelse(@HAVE_DBUS@, 1, [dnl
-.ifexists module-dbus-protocol at PA_SOEXT@
-load-module module-dbus-protocol
-.endif
-])dnl
 
 ### Network access (may be configured with paprefs, so leave this commented
 ### here if you plan to use paprefs)
@@ -129,7 +124,10 @@ load-module module-gconf
 .fail
 .endif
 
-### Automatically restore the default sink/source when changed by the user during runtime
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
 load-module module-default-device-restore
 
 ### Automatically move streams to the default sink if the sink they are
@@ -165,6 +163,13 @@ load-module module-filter-heuristics
 load-module module-filter-apply
 ])dnl
 
+ifelse(@HAVE_DBUS@, 1, [dnl
+### Load DBus protocol
+.ifexists module-dbus-protocol at PA_SOEXT@
+load-module module-dbus-protocol
+.endif
+])dnl
+
 ifelse(@HAVE_X11@, 1, [dnl
 # X11 modules should not be started from default.pa so that one daemon
 # can be shared by multiple sessions.
diff --git a/src/daemon/system.pa.in b/src/daemon/system.pa.in
index 0cd10b8..e881a12 100755
--- a/src/daemon/system.pa.in
+++ b/src/daemon/system.pa.in
@@ -40,19 +40,23 @@ load-module module-detect
 .ifexists module-esound-protocol-unix at PA_SOEXT@
 load-module module-esound-protocol-unix
 .endif
-.ifexists module-dbus-protocol at PA_SOEXT@
-### If you want to allow TCP connections, set access to "remote" or "local,remote".
-load-module module-dbus-protocol access=local
-.endif
 load-module module-native-protocol-unix
 
 ### Automatically restore the volume of streams and devices
 load-module module-stream-restore
 load-module module-device-restore
 
-### Automatically restore the default sink/source when changed by the user during runtime
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
 load-module module-default-device-restore
 
+.ifexists module-dbus-protocol at PA_SOEXT@
+### If you want to allow TCP connections, set access to "remote" or "local,remote".
+load-module module-dbus-protocol access=local
+.endif
+
 ### Automatically move streams to the default sink if the sink they are
 ### connected to dies, similar for sources
 load-module module-rescue-streams