[pulseaudio-commits] src/daemon

[Tanu Kaskinen]

 src/daemon/daemon-conf.c  |    2 +-
 src/daemon/daemon.conf.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4ac62d46903c3f80cf73645d57ee072116371775
Author: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>
Date:   Tue Jul 1 08:12:59 2014 +0200

    daemon-conf: changing default rlimit_rttime value to 200 ms
    
    Since rtkit v11, the top limit for rttime is 200 ms (previously it
    was wrongly limited to 2 seconds).
    
    Reviewed-by: David Henningsson <david.henningsson at canonical.com>
    Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti at canonical.com>

diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index d0e177c..b7a85aa 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -139,7 +139,7 @@ static const pa_daemon_conf default_conf = {
    ,.rlimit_rtprio = { .value = 9, .is_set = true }    /* One below JACK's default for the server */
 #endif
 #ifdef RLIMIT_RTTIME
-   ,.rlimit_rttime = { .value = PA_USEC_PER_SEC, .is_set = true }
+   ,.rlimit_rttime = { .value = 200*PA_USEC_PER_MSEC, .is_set = true } /* rtkit's limit is 200 ms */
 #endif
 #endif
 };
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 2089058..5b20130 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -75,7 +75,7 @@ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
 ; rlimit-msgqueue = -1
 ; rlimit-nice = 31
 ; rlimit-rtprio = 9
-; rlimit-rttime = 1000000
+; rlimit-rttime = 200000
 ])dnl
 
 ; default-sample-format = s16le