summaryrefslogtreecommitdiffstats
path: root/src/daemon/default.pa.in
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-07-31 23:34:09 +0300
committerLennart Poettering <lennart@poettering.net>2008-07-31 23:34:09 +0300
commitd757dc7ff47a47d760cc5959579b010fb5a8b214 (patch)
treefbf258c55e7da38c66b2585542f241bb473d7ab7 /src/daemon/default.pa.in
parent297267b9c4e297cc1c26dbc1e6d0be476443f128 (diff)
parent80428d80b03b3c26bd25169fa4083e16cf6bfafc (diff)
Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio
Diffstat (limited to 'src/daemon/default.pa.in')
-rwxr-xr-xsrc/daemon/default.pa.in30
1 files changed, 17 insertions, 13 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index aad9f5d6..917fc309 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -16,6 +16,9 @@
# along with PulseAudio; if not, write to the Free Software Foundation,
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+# This startup script is used only if PulseAudio is started per-user
+# (i.e. not in system mode)
+
.nofail
### Load something into the sample cache
@@ -80,14 +83,6 @@ load-module module-always-sink
### Automatically suspend sinks/sources that become idle for too long
load-module module-suspend-on-idle
-### Load X11 bell module
-#load-module module-x11-bell sample=bell-windowing-system
-
-### Register ourselves in the X11 session manager
-# Deactivated by default, to avoid deadlock when PA is started as esd from gnome-session
-# Instead we load this via /etc/xdg/autostart/ and "pactl load-module" now
-#load-module module-x11-xsmp
-
### If autoexit on idle is enabled we want to make sure we only quit
### when no local session needs us anymore.
load-module module-console-kit
@@ -104,12 +99,21 @@ load-module module-gconf
.fail
.endif
+# X11 modules should not be started from default.pa so that one daemon
+# can be shared by multiple sessions.
+
+### Load X11 bell module
+#load-module module-x11-bell sample=bell-windowing-system
+
+### Register ourselves in the X11 session manager
+#load-module module-x11-xsmp
+
### Publish connection data in the X11 root window
-.ifexists module-x11-publish@PA_SOEXT@
-.nofail
-load-module module-x11-publish
-.fail
-.endif
+#.ifexists module-x11-publish@PA_SOEXT@
+#.nofail
+#load-module module-x11-publish
+#.fail
+#.endif
### Make some devices default
#set-default-sink output