mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: Make sure module-dbus-protocol is loaded after module-default-device-restore

Browse source 
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>
This commit is contained in:
David Henningsson 2011-09-14 14:55:07 +02:00 • committed by Arun Raghavan
parent f8624a7876
commit 766dbc6838
2 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/daemon/default.pa.in
View file

@ -98,11 +98,6 @@ load-module module-esound-protocol-unix
.endif .endif
load-module module-native-protocol-unix load-module module-native-protocol-unix
])dnl ])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 ### Network access (may be configured with paprefs, so leave this commented
### here if you plan to use paprefs) ### here if you plan to use paprefs)
@ -129,7 +124,10 @@ load-module module-gconf
.fail .fail
.endif .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 load-module module-default-device-restore
### Automatically move streams to the default sink if the sink they are ### 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 load-module module-filter-apply
])dnl ])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 ifelse(@HAVE_X11@, 1, [dnl
# X11 modules should not be started from default.pa so that one daemon # X11 modules should not be started from default.pa so that one daemon
# can be shared by multiple sessions. # can be shared by multiple sessions.

14
src/daemon/system.pa.in
View file

@ -40,19 +40,23 @@ load-module module-detect
.ifexists module-esound-protocol-unix@PA_SOEXT@ .ifexists module-esound-protocol-unix@PA_SOEXT@
load-module module-esound-protocol-unix load-module module-esound-protocol-unix
.endif .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 load-module module-native-protocol-unix
### Automatically restore the volume of streams and devices ### Automatically restore the volume of streams and devices
load-module module-stream-restore load-module module-stream-restore
load-module module-device-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 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 ### Automatically move streams to the default sink if the sink they are
### connected to dies, similar for sources ### connected to dies, similar for sources
load-module module-rescue-streams load-module module-rescue-streams