Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

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

diff --git a/src/daemon/daemon.conf.in b/src/daemon/daemon.conf.in
index 9bea6148c4da945d01555477c80a9d67b68b1467..a11fd06c56536243b26b2188dea471f0da25f15b 100644 (file)
--- a/src/daemon/daemon.conf.in
+++ b/src/daemon/daemon.conf.in
@@ -21,15 +21,15 @@
 
 ; daemonize = no
 ; fail = yes
-; disallow-module-loading = no
-; disallow-exit = no
+; allow-module-loading = yes
+; allow-exit = yes
 ; use-pid-file = yes
 ; system-instance = no
 ; local-server-type = user
-; disable-shm = no
+; enable-shm = yes
 ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
 ; lock-memory = no
-; no-cpu-limit = no
+; cpu-limit = yes
 
 ; high-priority = yes
 ; nice-level = -11
@@ -52,8 +52,8 @@
 ; log-backtrace = 0
 
 ; resample-method = speex-float-3
-; disable-remixing = no
-; disable-lfe-remixing = yes
+; enable-remixing = yes
+; enable-lfe-remixing = no
 
 ; flat-volumes = yes