diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2016-02-06 15:35:31 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2016-02-09 13:04:49 +0200 |
| commit | 3813caf4fb6c91a7085f3a98616848dc86de0a8d (patch) | |
| tree | 7262e0a43f0c9d17f9e3b4f6f98b343a1410c010 | |
| parent | 54bb94b5771cdf0edf728a8048a078cf6c3cfc75 (diff) | |
default.pa: remove X11 module examples
Loading X stuff from default.pa is a bad idea, since it doesn't work
if there are multiple X sessions, or PulseAudio is started outside the
X session. Since it's a bad idea, don't encourage it by including
examples that do so.
I also removed the sample loading examples. I don't think the examples
are particularly useful, since nothing uses the loaded samples once
module-x11-bell is removed from the configuration.
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=93109
| -rwxr-xr-x | src/daemon/default.pa.in | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in index 783e326b..7a686538 100755 --- a/src/daemon/default.pa.in +++ b/src/daemon/default.pa.in @@ -19,19 +19,6 @@ # (i.e. not in system mode) changequote(`[', `]')dnl Set up m4 quoting -.nofail - -### Load something into the sample cache -ifelse(@OS_IS_WIN32@, 1, [dnl -load-sample x11-bell %WINDIR%\Media\ding.wav -load-sample-dir-lazy %WINDIR%\Media\*.wav -], [dnl -#load-sample-lazy x11-bell /usr/share/sounds/freedesktop/stereo/bell.oga -#load-sample-lazy pulse-hotplug /usr/share/sounds/freedesktop/stereo/device-added.oga -#load-sample-lazy pulse-coldplug /usr/share/sounds/freedesktop/stereo/device-added.oga -#load-sample-lazy pulse-access /usr/share/sounds/freedesktop/stereo/message.oga -])dnl - .fail ### Automatically restore the volume of streams and devices @@ -174,24 +161,6 @@ load-module module-filter-heuristics load-module module-filter-apply ])dnl -ifelse(@HAVE_X11@, 1, [dnl -# 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=x11-bell - -### 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 -])dnl - ### Make some devices default #set-default-sink output #set-default-source input |