enable exit-on-idle by default

5 files changed, 18 insertions, 17 deletions

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 9ac40901..50b812dc 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -62,7 +62,7 @@ static const pa_daemon_conf default_conf = {
     .realtime_scheduling = FALSE,
     .realtime_priority = 5,  /* Half of JACK's default rtprio */
     .disallow_module_loading = FALSE,
-    .exit_idle_time = -1,
+    .exit_idle_time = 20,
     .module_idle_time = 20,
     .scache_idle_time = 20,
     .auto_log_target = 1,
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index dfabcfb2..41c26e2a 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -32,7 +32,7 @@
 ; realtime-scheduling = no
 ; realtime-priority = 5
 
-; exit-idle-time = -1
+; exit-idle-time = 20
 ; module-idle-time = 20
 ; scache-idle-time = 20
 
diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in
index aad9f5d6..498499e7 100755
--- a/src/daemon/default.pa.in
+++ b/src/daemon/default.pa.in
@@ -80,14 +80,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 +96,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
diff --git a/src/pulse/client-conf.c b/src/pulse/client-conf.c
index 2ead871f..915d0ccb 100644
--- a/src/pulse/client-conf.c
+++ b/src/pulse/client-conf.c
@@ -66,7 +66,7 @@ pa_client_conf *pa_client_conf_new(void) {
     pa_client_conf *c = pa_xmemdup(&default_conf, sizeof(default_conf));
 
     c->daemon_binary = pa_xstrdup(PA_BINARY);
-    c->extra_arguments = pa_xstrdup("--log-target=syslog --exit-idle-time=5");
+    c->extra_arguments = pa_xstrdup("--log-target=syslog");
     c->cookie_file = pa_xstrdup(PA_NATIVE_COOKIE_FILE);
 
     return c;
diff --git a/src/pulse/client.conf.in b/src/pulse/client.conf.in
index 749e9688..8339d651 100644
--- a/src/pulse/client.conf.in
+++ b/src/pulse/client.conf.in
@@ -25,7 +25,7 @@
 
 ; autospawn = yes
 ; daemon-binary = @PA_BINARY@
-; extra-arguments = --log-target=syslog --exit-idle-time=5
+; extra-arguments = --log-target=syslog
 
 ; cookie-file =