daemon: optionally call mlockall() on startup

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

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index ea09fe09c6fbd7dd1937ece47f4230fa7290a38d..746ea76c5512ee7f15a5efba0d6e7ab13051cb43 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -26,6 +26,9 @@
 ; use-pid-file = yes
 ; system-instance = no
 ; 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
@@ -39,17 +42,20 @@
 
 ; dl-search-path = (depends on architecture)
 
-; load-defaul-script-file = yes
+; load-default-script-file = yes
 ; default-script-file = @PA_DEFAULT_CONFIG_FILE@
 
 ; log-target = auto
 ; log-level = notice
+; log-meta = no
+; log-time = no
+; log-backtrace = 0
 
 ; resample-method = speex-float-3
 ; disable-remixing = no
 ; disable-lfe-remixing = yes
 
-; no-cpu-limit = no
+; flat-volumes = yes
 
 ; rlimit-fsize = -1
 ; rlimit-data = -1
@@ -70,6 +76,7 @@
 ; default-sample-format = s16le
 ; default-sample-rate = 44100
 ; default-sample-channels = 2
+; default-channel-map = front-left,front-right
 
 ; default-fragments = 4
 ; default-fragment-size-msec = 25