mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-20 06:59:53 -05:00
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts: src/Makefile.am src/daemon/daemon-conf.c src/daemon/daemon.conf.in src/modules/module-stream-restore.c src/pulse/client-conf.c src/pulsecore/namereg.c
This commit is contained in:
commit
bcaba0b1b4
134 changed files with 15076 additions and 12812 deletions
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue