summaryrefslogtreecommitdiffstats
path: root/src/daemon
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-06-11 19:45:57 +0000
committerLennart Poettering <lennart@poettering.net>2008-06-11 19:45:57 +0000
commit92e4fb318e5f1e483911ed44743115bae1d0fd54 (patch)
tree1db9f7dbb0576e7801202f1e66db15ff1c607b1b /src/daemon
parent1337afdee49e69f77f342ba694f53cccc5446453 (diff)
merge Colin Guthrie's module-always-sink module, and add priorization to the hook subsystem while doing so.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2516 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/daemon')
-rwxr-xr-xsrc/daemon/default.pa.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index 057b79c8..aad9f5d6 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -74,11 +74,14 @@ load-module module-default-device-restore
### connected to dies, similar for sources
load-module module-rescue-streams
+### Make sure we always have a sink around, even if it is a null sink.
+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=x11-bell
+#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