summaryrefslogtreecommitdiffstats
path: root/src/daemon/daemon.conf.in
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2009-10-02 17:24:44 +0300
committerTanu Kaskinen <tanuk@iki.fi>2009-10-02 17:24:44 +0300
commit019331d25b6af107fb8cacc3ada552e7567a64bf (patch)
treed5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/daemon/daemon.conf.in
parent587131917f9129c8347c789febb7e755dfb091de (diff)
parentafd1b6d355ef1a41cb3592485855e273a5de69c1 (diff)
Merge branch 'master' into dbus-work
Conflicts: src/daemon/daemon-conf.c
Diffstat (limited to 'src/daemon/daemon.conf.in')
-rw-r--r--src/daemon/daemon.conf.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index a11fd06c..7c1a7b8c 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -29,7 +29,7 @@
; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no
-; cpu-limit = yes
+; cpu-limit = no
; high-priority = yes
; nice-level = -11
@@ -71,7 +71,7 @@
; rlimit-msgqueue = -1
; rlimit-nice = 31
; rlimit-rtprio = 9
-; rlimit-rtttime = 1000000
+; rlimit-rttime = 1000000
; default-sample-format = s16le
; default-sample-rate = 44100