summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--man/pulse-daemon.conf.5.xml.in4
-rw-r--r--src/daemon/daemon-conf.c2
-rw-r--r--src/daemon/daemon.conf.in2
3 files changed, 4 insertions, 4 deletions
diff --git a/man/pulse-daemon.conf.5.xml.in b/man/pulse-daemon.conf.5.xml.in
index 82c2b8e5..e6b1e190 100644
--- a/man/pulse-daemon.conf.5.xml.in
+++ b/man/pulse-daemon.conf.5.xml.in
@@ -133,11 +133,11 @@ USA.
</option>
<option>
- <p><opt>cpu-limit=</opt> If disabled d not install the CPU load
+ <p><opt>cpu-limit=</opt> If disabled do not install the CPU load
limiter, even on platforms where it is supported. This option is
useful when debugging/profiling PulseAudio to disable disturbing
SIGXCPU signals. Takes a boolean argument, defaults to
- <opt>yes</opt>. The <opt>--no-cpu-limit</opt> command line
+ <opt>no</opt>. The <opt>--no-cpu-limit</opt> command line
argument takes precedence.</p>
</option>
diff --git a/src/daemon/daemon-conf.c b/src/daemon/daemon-conf.c
index ec1ec5ce..6e7926f8 100644
--- a/src/daemon/daemon-conf.c
+++ b/src/daemon/daemon-conf.c
@@ -83,7 +83,7 @@ static const pa_daemon_conf default_conf = {
.config_file = NULL,
.use_pid_file = TRUE,
.system_instance = FALSE,
- .no_cpu_limit = FALSE,
+ .no_cpu_limit = TRUE,
.disable_shm = FALSE,
.lock_memory = FALSE,
.default_n_fragments = 4,
diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index d8b58d8a..db2059e1 100644
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -28,7 +28,7 @@
; 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