Merge branch 'master' into dbus-work

[pulseaudio] / src / daemon / daemon.conf.in

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index ecdb3a642a9ebbb1fd090e39839edc6f6ec751dc..9bea6148c4da945d01555477c80a9d67b68b1467 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -28,15 +28,16 @@
 ; local-server-type = user
 ; disable-shm = no
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
+; lock-memory = no
+; no-cpu-limit = no
 
 ; high-priority = yes
 ; nice-level = -11
 
-; realtime-scheduling = no
+; realtime-scheduling = yes
 ; realtime-priority = 5
 
 ; exit-idle-time = 20
-; module-idle-time = 20
 ; scache-idle-time = 20
 
 ; dl-search-path = (depends on architecture)
@@ -56,8 +57,6 @@
 
 ; flat-volumes = yes
 
-; no-cpu-limit = no
-
 ; rlimit-fsize = -1
 ; rlimit-data = -1
 ; rlimit-stack = -1