mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-09 13:29:59 -05:00
Merge branch 'master' into dbus-work
Conflicts: src/daemon/daemon-conf.c
This commit is contained in:
commit
019331d25b
130 changed files with 24774 additions and 14714 deletions
|
|
@ -86,7 +86,7 @@ static const pa_daemon_conf default_conf = {
|
|||
#ifdef HAVE_DBUS
|
||||
.local_server_type = PA_SERVER_TYPE_UNSET, /* The actual default is _USER, but we have to detect when the user doesn't specify this option. */
|
||||
#endif
|
||||
.no_cpu_limit = FALSE,
|
||||
.no_cpu_limit = TRUE,
|
||||
.disable_shm = FALSE,
|
||||
.lock_memory = FALSE,
|
||||
.default_n_fragments = 4,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue