mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-19 07:00:03 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon.conf: Add boolean rescue_streams parameter

Browse source 
Since merge requests

https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/209 and
https://gitlab.freedesktop.org/pulseaudio/pulseaudio/merge_requests/216

the rescuing of streams could no longer be disabled. This patch adds a boolean
parameter rescue-streams to daemon.conf which allows to disable rescuing.

The parameter defaults to true (rescuing enabled).
This commit is contained in:
Georg Chini 2020-01-22 08:12:59 +01:00 • committed by Tanu Kaskinen
parent 97d0eda256
commit b72f295597
11 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/daemon/daemon-conf.c
View file

@ -69,6 +69,7 @@ static const pa_daemon_conf default_conf = {
.disallow_module_loading = false,
.disallow_exit = false,
.flat_volumes = false,
.rescue_streams = true,
.exit_idle_time = 20,
.scache_idle_time = 20,
.script_commands = NULL,
@ -580,6 +581,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
{ "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL },
{ "enable-memfd", pa_config_parse_not_bool, &c->disable_memfd, NULL },
{ "flat-volumes", pa_config_parse_bool, &c->flat_volumes, NULL },
{ "rescue-streams", pa_config_parse_bool, &c->rescue_streams, NULL },
{ "lock-memory", pa_config_parse_bool, &c->lock_memory, NULL },
{ "enable-deferred-volume", pa_config_parse_bool, &c->deferred_volume, NULL },
{ "exit-idle-time", pa_config_parse_int, &c->exit_idle_time, NULL },
@ -794,6 +796,7 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf_printf(s, "cpu-limit = %s\n", pa_yes_no(!c->no_cpu_limit));
pa_strbuf_printf(s, "enable-shm = %s\n", pa_yes_no(!c->disable_shm));
pa_strbuf_printf(s, "flat-volumes = %s\n", pa_yes_no(c->flat_volumes));
pa_strbuf_printf(s, "rescue-streams = %s\n", pa_yes_no(c->rescue_streams));
pa_strbuf_printf(s, "lock-memory = %s\n", pa_yes_no(c->lock_memory));
pa_strbuf_printf(s, "exit-idle-time = %i\n", c->exit_idle_time);
pa_strbuf_printf(s, "scache-idle-time = %i\n", c->scache_idle_time);

1
src/daemon/daemon-conf.h
View file

@ -77,6 +77,7 @@ typedef struct pa_daemon_conf {
log_meta,
log_time,
flat_volumes,
rescue_streams,
lock_memory,
deferred_volume;
pa_server_type_t local_server_type;

2
src/daemon/daemon.conf.in
View file

@ -63,6 +63,8 @@ ifelse(@HAVE_DBUS@, 1, [dnl
; flat-volumes = no
; rescue-streams = yes
ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
; rlimit-fsize = -1
; rlimit-data = -1

1
src/daemon/main.c
View file

@ -1062,6 +1062,7 @@ int main(int argc, char *argv[]) {
c->running_as_daemon = conf->daemonize;
c->disallow_exit = conf->disallow_exit;
c->flat_volumes = conf->flat_volumes;
c->rescue_streams = conf->rescue_streams;
#ifdef HAVE_DBUS
c->server_type = conf->local_server_type;
#endif