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

load module-x11-xsmp from a /etc/xdg/autostart file, to make sure it is loaded when we have XSMP

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1660 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-13 23:49:26 +00:00
parent 80f5abf6d9
commit 44f91cfafa
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/Makefile.am
View file

@ -30,6 +30,7 @@ pulseincludedir=$(includedir)/pulse
pulsecoreincludedir=$(includedir)/pulsecore pulsecoreincludedir=$(includedir)/pulsecore
pulseconfdir=$(sysconfdir)/pulse pulseconfdir=$(sysconfdir)/pulse
pulselibexecdir=$(libexecdir)/pulse pulselibexecdir=$(libexecdir)/pulse
xdgautostartdir=$(sysconfdir)/xdg/autostart
################################### ###################################
# Defines # # Defines #
@ -103,13 +104,19 @@ EXTRA_DIST = \
depmod.py \ depmod.py \
daemon/esdcompat.in \ daemon/esdcompat.in \
utils/padsp \ utils/padsp \
modules/module-defs.h.m4 modules/module-defs.h.m4 \
daemon/pulseaudio-module-xsmp.desktop
pulseconf_DATA = \ pulseconf_DATA = \
default.pa \ default.pa \
daemon.conf \ daemon.conf \
client.conf client.conf
if HAVE_X11
xdgautostart_DATA = \
daemon/pulseaudio-module-xsmp.desktop
endif
BUILT_SOURCES = \ BUILT_SOURCES = \
pulse/version.h pulse/version.h

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

@ -77,7 +77,8 @@ load-module module-x11-bell sample=x11-bell
load-module module-x11-publish load-module module-x11-publish
### Register ourselves in the X11 session manager ### 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-module module-x11-xsmp
### Load additional modules from GConf settings. This can be configured with the paprefs tool. ### Load additional modules from GConf settings. This can be configured with the paprefs tool.

10
src/daemon/pulseaudio-module-xsmp.desktop Normal file
View file

@ -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=