[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. 5edbb57516835688b1a47a3e0813b3965b014db2
Lennart Poettering
gitmailer-noreply at 0pointer.de
Tue Jul 22 12:13:52 PDT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.
The master branch has been updated
from c1f9f95fa2bbd9ea93d7e32c095626ace7b5d6f9 (commit)
- Log -----------------------------------------------------------------
5edbb57... don't drop caps if we are started as normal root user
3888bfc... enable exit-on-idle by default
-----------------------------------------------------------------------
Summary of changes:
src/daemon/daemon-conf.c | 2 +-
src/daemon/daemon.conf.in | 2 +-
src/daemon/default.pa.in | 27 ++++++++++++++-------------
src/daemon/main.c | 2 +-
src/pulse/client-conf.c | 2 +-
src/pulse/client.conf.in | 2 +-
6 files changed, 19 insertions(+), 18 deletions(-)
-----------------------------------------------------------------------
commit 3888bfcccd8324d23a7bc31ebb2d8063d9da1aaf
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 22 19:45:18 2008 +0200
enable exit-on-idle by default
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index 9ac4090..50b812d 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 dfabcfb..41c26e2 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 aad9f5d..498499e 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 at PA_SOEXT@
-.nofail
-load-module module-x11-publish
-.fail
-.endif
+#.ifexists module-x11-publish at 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 2ead871..915d0cc 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 749e968..8339d65 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 =
commit 5edbb57516835688b1a47a3e0813b3965b014db2
Author: Lennart Poettering <lennart at poettering.net>
Date: Tue Jul 22 21:13:46 2008 +0200
don't drop caps if we are started as normal root user
diff --git a/src/daemon/main.c b/src/daemon/main.c
index 1459441..553ed7d 100644
--- a/src/daemon/main.c
+++ b/src/daemon/main.c
@@ -496,7 +496,7 @@ int main(int argc, char *argv[]) {
if (conf->high_priority && (conf->cmd == PA_CMD_DAEMON || conf->cmd == PA_CMD_START))
pa_raise_priority(conf->nice_level);
- if (pa_have_caps()) {
+ if (!real_root && pa_have_caps()) {
pa_bool_t drop;
drop = (conf->cmd != PA_CMD_DAEMON && conf->cmd != PA_CMD_START) || !conf->realtime_scheduling;
--
hooks/post-receive
PulseAudio Sound Server
More information about the pulseaudio-commits
mailing list