[pulseaudio-commits] r1660 - in /branches/lennart/src: Makefile.am daemon/default.pa.in daemon/pulseaudio-module-xsmp.desktop

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Tue Aug 14 01:49:26 2007
New Revision: 1660

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=3D1660&root=3Dpulseaudio&vi=
ew=3Drev
Log:
load module-x11-xsmp from a /etc/xdg/autostart file, to make sure it is loa=
ded when we have XSMP

Added:
    branches/lennart/src/daemon/pulseaudio-module-xsmp.desktop   (with prop=
s)
Modified:
    branches/lennart/src/Makefile.am
    branches/lennart/src/daemon/default.pa.in

Modified: branches/lennart/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/Makefile.a=
m?rev=3D1660&root=3Dpulseaudio&r1=3D1659&r2=3D1660&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/Makefile.am (original)
+++ branches/lennart/src/Makefile.am Tue Aug 14 01:49:26 2007
@@ -30,6 +30,7 @@
 pulsecoreincludedir=3D$(includedir)/pulsecore
 pulseconfdir=3D$(sysconfdir)/pulse
 pulselibexecdir=3D$(libexecdir)/pulse
+xdgautostartdir=3D$(sysconfdir)/xdg/autostart
 =

 ###################################
 #            Defines              #
@@ -103,12 +104,18 @@
 		depmod.py \
 		daemon/esdcompat.in \
 		utils/padsp \
-		modules/module-defs.h.m4
+		modules/module-defs.h.m4 \
+		daemon/pulseaudio-module-xsmp.desktop
 =

 pulseconf_DATA =3D \
 		default.pa \
 		daemon.conf \
 		client.conf
+
+if HAVE_X11
+xdgautostart_DATA =3D \
+		daemon/pulseaudio-module-xsmp.desktop
+endif
 =

 BUILT_SOURCES =3D \
 		pulse/version.h

Modified: branches/lennart/src/daemon/default.pa.in
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/def=
ault.pa.in?rev=3D1660&root=3Dpulseaudio&r1=3D1659&r2=3D1660&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/daemon/default.pa.in (original)
+++ branches/lennart/src/daemon/default.pa.in Tue Aug 14 01:49:26 2007
@@ -77,7 +77,8 @@
 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 wi=
th the paprefs tool.

Added: branches/lennart/src/daemon/pulseaudio-module-xsmp.desktop
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/lennart/src/daemon/pul=
seaudio-module-xsmp.desktop?rev=3D1660&root=3Dpulseaudio&view=3Dauto
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/lennart/src/daemon/pulseaudio-module-xsmp.desktop (added)
+++ branches/lennart/src/daemon/pulseaudio-module-xsmp.desktop Tue Aug 14 0=
1:49:26 2007
@@ -1,0 +1,10 @@
+[Desktop Entry]
+Version=3D1.0
+Encoding=3DUTF-8
+Name=3DPulseAudio Session Management
+Comment=3DLoad module-x11-xsmp into PulseAudio
+Exec=3Dpactl load-module module-x11-xsmp
+Terminal=3Dfalse
+Type=3DApplication
+Categories=3D
+GenericName=3D

Propchange: branches/lennart/src/daemon/pulseaudio-module-xsmp.desktop
---------------------------------------------------------------------------=
---
    svn:keywords =3D Id