build-sys: Move some more defines to configure.ac

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

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index d8b58d8a0a40d729fa24ee388e82f79594322c60..9eee664cc2681917aacc6757073c60ecde839c27 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -16,7 +16,7 @@
 # USA.
 
 ## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
-## more information. Default values a commented out.  Use either ; or # for
+## more information. Default values are commented out.  Use either ; or # for
 ## commenting.
 
 ; daemonize = no
@@ -25,10 +25,11 @@
 ; allow-exit = yes
 ; use-pid-file = yes
 ; system-instance = no
+; local-server-type = user
 ; 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
@@ -42,7 +43,7 @@
 ; dl-search-path = (depends on architecture)
 
 ; load-default-script-file = yes
-; default-script-file = @PA_DEFAULT_CONFIG_FILE@
+; default-script-file = @PA_DEFAULT_CONFIG_DIR@/default.pa
 
 ; log-target = auto
 ; log-level = notice
@@ -70,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
@@ -79,3 +80,7 @@
 
 ; default-fragments = 4
 ; default-fragment-size-msec = 25
+
+; enable-sync-volume = yes
+; sync-volume-safety-margin-usec = 8000
+; sync-volume-extra-delay-usec = 0