diff options
| author | David Henningsson <david.henningsson@canonical.com> | 2011-09-14 14:55:07 +0200 |
|---|---|---|
| committer | Arun Raghavan <arun.raghavan@collabora.co.uk> | 2011-09-15 06:40:18 +0530 |
| commit | 766dbc68388eed786f00524517cfe67c1b1585c2 (patch) | |
| tree | 1cb4dd42172fa184420fc256acc1ce9ea8c3735f | |
| parent | f8624a7876444ebb5587c1f1bc821ab5c3a2b639 (diff) | |
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@canonical.com>
| -rwxr-xr-x | src/daemon/default.pa.in | 17 | ||||
| -rwxr-xr-x | src/daemon/system.pa.in | 14 |
2 files changed, 20 insertions, 11 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 6155b312..57f259c5 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@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@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 0cd10b83..e881a127 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@PA_SOEXT@ load-module module-esound-protocol-unix .endif -.ifexists module-dbus-protocol@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@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 |