diff options
| author | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-30 23:43:45 +0100 |
|---|---|---|
| committer | Colin Guthrie <pulse@colin.guthr.ie> | 2008-07-30 23:43:45 +0100 |
| commit | b30a5d601eaffd98914ca0b9fdecd863eade0b4f (patch) | |
| tree | 2bf5dfaa46b8e1733311562dba299709a0a3228e /src/daemon/default.pa.in | |
| parent | 0e1936fd56ad51509424f3eca06fe3a442b4dc9c (diff) | |
| parent | 0b428e7cb1efdd7330b89a9855f08c45bfa98307 (diff) | |
Merge branch 'master' of git://git.0pointer.de/pulseaudio
Diffstat (limited to 'src/daemon/default.pa.in')
| -rwxr-xr-x | src/daemon/default.pa.in | 30 |
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 |