volume: Rename 'sync volume' to 'deferred volume'.

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

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index e4cfb82b233c450b672e4a19e53af45bab731d6e..b13ede77d42e648734de29026f8dae6d17116a9e 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -1,5 +1,3 @@
-# $Id$
-#
 # This file is part of PulseAudio.
 #
 # PulseAudio is free software; you can redistribute it and/or modify
@@ -18,52 +16,76 @@
 # 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.
+changequote(`[', `]')dnl Set up m4 quoting
 
 ; daemonize = no
 ; fail = yes
-; disallow-module-loading = no
+; allow-module-loading = yes
+; allow-exit = yes
 ; use-pid-file = yes
 ; system-instance = no
-; disable-shm = no
+ifelse(@HAVE_DBUS@, 1, [dnl
+; local-server-type = user
+])dnl
+; enable-shm = yes
+; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
+; lock-memory = no
+; cpu-limit = no
 
 ; high-priority = yes
 ; nice-level = -11
 
-; realtime-scheduling = no
+; realtime-scheduling = yes
 ; realtime-priority = 5
 
-; exit-idle-time = -1
-; module-idle-time = 20
+; exit-idle-time = 20
 ; scache-idle-time = 20
 
 ; dl-search-path = (depends on architecture)
 
-; default-script-file = @PA_DEFAULT_CONFIG_FILE@
+; load-default-script-file = yes
+; default-script-file = @PA_DEFAULT_CONFIG_DIR@/default.pa
 
 ; log-target = auto
 ; log-level = notice
+; log-meta = no
+; log-time = no
+; log-backtrace = 0
 
 ; resample-method = speex-float-3
-; disable-remixing = no
+; enable-remixing = yes
+; enable-lfe-remixing = no
 
-; no-cpu-limit = no
+; flat-volumes = yes
 
-; rlimit-as = -1
-; rlimit-core = -1
-; rlimit-data = -1
+ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
 ; rlimit-fsize = -1
-; rlimit-nofile = 256
+; rlimit-data = -1
 ; rlimit-stack = -1
+; rlimit-core = -1
+; rlimit-as = -1
+; rlimit-rss = -1
 ; rlimit-nproc = -1
+; rlimit-nofile = 256
 ; rlimit-memlock = -1
+; rlimit-locks = -1
+; rlimit-sigpending = -1
+; rlimit-msgqueue = -1
 ; rlimit-nice = 31
 ; rlimit-rtprio = 9
+; rlimit-rttime = 1000000
+])dnl
 
 ; 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
+
+; enable-deferred-volume = yes
+; deferred-volume-safety-margin-usec = 8000
+; deferred-volume-extra-delay-usec = 0