summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-08-13 23:49:26 +0000
committerLennart Poettering <lennart@poettering.net>2007-08-13 23:49:26 +0000
commit44f91cfafa0c615f773095a822ab7c0c5bdcb585 (patch)
tree6f69dbcf98d5ff1dbfbac196f52b7fae27023db4
parent80f5abf6d967a26ac8e40ee3276c8258f6e0af59 (diff)
load module-x11-xsmp from a /etc/xdg/autostart file, to make sure it is loaded when we have XSMP
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1660 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/Makefile.am9
-rwxr-xr-xsrc/daemon/default.pa.in3
-rw-r--r--src/daemon/pulseaudio-module-xsmp.desktop10
3 files changed, 20 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index aa5160a4..a962826a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -30,6 +30,7 @@ pulseincludedir=$(includedir)/pulse
pulsecoreincludedir=$(includedir)/pulsecore
pulseconfdir=$(sysconfdir)/pulse
pulselibexecdir=$(libexecdir)/pulse
+xdgautostartdir=$(sysconfdir)/xdg/autostart
###################################
# Defines #
@@ -103,13 +104,19 @@ EXTRA_DIST = \
depmod.py \
daemon/esdcompat.in \
utils/padsp \
- modules/module-defs.h.m4
+ modules/module-defs.h.m4 \
+ daemon/pulseaudio-module-xsmp.desktop
pulseconf_DATA = \
default.pa \
daemon.conf \
client.conf
+if HAVE_X11
+xdgautostart_DATA = \
+ daemon/pulseaudio-module-xsmp.desktop
+endif
+
BUILT_SOURCES = \
pulse/version.h
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index c472c09b..6ece607d 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -77,7 +77,8 @@ load-module module-x11-bell sample=x11-bell
load-module module-x11-publish
### Register ourselves in the X11 session manager
-# Deactivated by default, to avoid deadlock when PA is started from gnome-session
+# 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
### Load additional modules from GConf settings. This can be configured with the paprefs tool.
diff --git a/src/daemon/pulseaudio-module-xsmp.desktop b/src/daemon/pulseaudio-module-xsmp.desktop
new file mode 100644
index 00000000..fa719a73
--- /dev/null
+++ b/src/daemon/pulseaudio-module-xsmp.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=PulseAudio Session Management
+Comment=Load module-x11-xsmp into PulseAudio
+Exec=pactl load-module module-x11-xsmp
+Terminal=false
+Type=Application
+Categories=
+GenericName=