merge 'lennart' branch back into trunk.

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

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 6e55c0ee68616e0e3c12900b2565ea856862f9fa..2132bf3d0f98e9e41301fb9f364d17630962c692 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -52,11 +52,11 @@
 ## The path were to look for dynamic shared objects (DSOs aka
 ## plugins).  You may specify more than one path seperated by
 ## colons. 
-; dl-search-path = @DLSEARCHPATH@
+; dl-search-path = @PA_DLSEARCHPATH@
 
 ## The default script file to load. Specify an empty string for not
 ## loading a default script file. The 
-; default-script-file = @DEFAULT_CONFIG_FILE@
+; default-script-file = @PA_DEFAULT_CONFIG_FILE@
 
 ## The default log target. Use either "stderr", "syslog" or
 ## "auto". The latter is equivalent to "sylog" in case daemonize is
@@ -79,5 +79,32 @@
 ## effectively disables multiple instances.
 ; use-pid-file = 1
 
+## Do not install the CPU load limit, even on platforms where it is
+## supported. This option is useful when debugging/profiling 
+## PulseAudio to disable disturbing SIGXCPU signals.
+; no-cpu-limit = 0
+
 ## Run the daemon as system-wide instance, requires root priviliges
 ; system-instance = 0
+
+## Resource limits, see getrlimit(2) for more information
+; rlimit-as = -1
+; rlimit-core = -1
+; rlimit-data = -1
+; rlimit-fsize = -1
+; rlimit-nofile = 256
+; rlimit-stack = -1
+; rlimit-nproc = -1
+; rlimit-memlock = 16384
+
+## Disable shared memory data transfer 
+; disable-shm = 0
+
+## Default sample format
+; default-sample-format = s16le
+; default-sample-rate = 44100
+; default-sample-channels = 2
+
+## Default fragment settings, for device drivers that need this
+; default-fragments = 4
+; default-fragment-size-msec = 25