mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

conf: invert all negative boolean configuration option

Browse source
This commit is contained in:
Lennart Poettering 2009-08-12 20:15:28 +02:00
parent 8998cba683
commit facae1f275
6 changed files with 62 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

4
man/pulse-client.conf.5.xml.in
View file

@ -92,9 +92,9 @@ USA.
</option> </option>
<option> <option>
<p><opt>disable-shm=</opt> Disable data transfer via POSIX <p><opt>enable-shm=</opt> Enable data transfer via POSIX
shared memory. Takes a boolean argument, defaults to shared memory. Takes a boolean argument, defaults to
<opt>no</opt>.</p> <opt>yes</opt>.</p>
</option> </option>
<option> <option>

59
man/pulse-daemon.conf.5.xml.in
View file

@ -65,20 +65,21 @@ USA.
</option> </option>
<option> <option>
<p><opt>disallow-module-loading=</opt> Disallow module loading <p><opt>allow-module-loading=</opt> Allow/disallow module
after startup. This is a security feature that makes sure that loading after startup. This is a security feature that if
no further modules may be loaded into the PulseAudio server dsabled makes sure that no further modules may be loaded into
after startup completed. It is recommended to enable this when the PulseAudio server after startup completed. It is recommended
<opt>system-instance</opt> is enabled. Please note that certain to disable this when <opt>system-instance</opt> is
features like automatic hot-plug support will not work if this enabled. Please note that certain features like automatic
option is enabled. Takes a boolean argument, defaults to hot-plug support will not work if this option is enabled. Takes
<opt>no</opt>. The <opt>--disallow-module-loading</opt> command line a boolean argument, defaults to <opt>yes</opt>. The
option takes precedence.</p> <opt>--disallow-module-loading</opt> command line option takes
precedence.</p>
</option> </option>
<option> <option>
<p><opt>disallow-exit=</opt> Disallow exit on user <p><opt>allow-exit=</opt> Allow/disallow exit on user
request. Defaults to <opt>no</opt>.</p> request. Defaults to <opt>yes</opt>.</p>
</option> </option>
<option> <option>
@ -105,19 +106,19 @@ USA.
</option> </option>
<option> <option>
<p><opt>disable-remixing=</opt> Never upmix or downmix channels <p><opt>enable-remixing=</opt> If disabled never upmix or
to different channel maps. Instead, do a simple name-based downmix channels to different channel maps. Instead, do a simple
matching only.</p> name-based matching only. Defaults to <opt>yes.</opt></p>
</option> </option>
<option> <option>
<p><opt>disable-lfe-remixing=</opt> When upmixing or downmixing <p><opt>enable-lfe-remixing=</opt> if disabeld when upmixing or
ignore LFE channels. When this option is on the output LFE downmixing ignore LFE channels. When this option is dsabled the
channel will only get a signal when an input LFE channel is output LFE channel will only get a signal when an input LFE
available as well. If no input LFE channel is available the channel is available as well. If no input LFE channel is
output LFE channel will always be 0. If no output LFE channel is available the output LFE channel will always be 0. If no output
available the signal on the input LFE channel will be LFE channel is available the signal on the input LFE channel
ignored. Defaults to "on".</p> will be ignored. Defaults to <opt>no</opt>.</p>
</option> </option>
<option> <option>
@ -132,12 +133,12 @@ USA.
</option> </option>
<option> <option>
<p><opt>no-cpu-limit=</opt> Do not install the CPU load limiter, <p><opt>cpu-limit=</opt> If disabled d not install the CPU load
even on platforms where it is supported. This option is useful limiter, even on platforms where it is supported. This option is
when debugging/profiling PulseAudio to disable disturbing useful when debugging/profiling PulseAudio to disable disturbing
SIGXCPU signals. Takes a boolean argument, defaults to <opt>no</opt>. The SIGXCPU signals. Takes a boolean argument, defaults to
<opt>--no-cpu-limit</opt> command line argument takes <opt>yes</opt>. The <opt>--no-cpu-limit</opt> command line
precedence.</p> argument takes precedence.</p>
</option> </option>
<option> <option>
@ -148,9 +149,9 @@ USA.
</option> </option>
<option> <option>
<p><opt>disable-shm=</opt> Disable data transfer via POSIX <p><opt>enable-shm=</opt> Enable data transfer via POSIX
shared memory. Takes a boolean argument, defaults to shared memory. Takes a boolean argument, defaults to
<opt>no</opt>. The <opt>--disable-shm</opt> command line <opt>yes</opt>. The <opt>--disable-shm</opt> command line
argument takes precedence.</p> argument takes precedence.</p>
</option> </option>

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

@ -441,11 +441,15 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
{ "high-priority", pa_config_parse_bool, &c->high_priority, NULL }, { "high-priority", pa_config_parse_bool, &c->high_priority, NULL },
{ "realtime-scheduling", pa_config_parse_bool, &c->realtime_scheduling, NULL }, { "realtime-scheduling", pa_config_parse_bool, &c->realtime_scheduling, NULL },
{ "disallow-module-loading", pa_config_parse_bool, &c->disallow_module_loading, NULL }, { "disallow-module-loading", pa_config_parse_bool, &c->disallow_module_loading, NULL },
{ "allow-module-loading", pa_config_parse_not_bool, &c->disallow_module_loading, NULL },
{ "disallow-exit", pa_config_parse_bool, &c->disallow_exit, NULL }, { "disallow-exit", pa_config_parse_bool, &c->disallow_exit, NULL },
{ "allow-exit", pa_config_parse_not_bool, &c->disallow_exit, NULL },
{ "use-pid-file", pa_config_parse_bool, &c->use_pid_file, NULL }, { "use-pid-file", pa_config_parse_bool, &c->use_pid_file, NULL },
{ "system-instance", pa_config_parse_bool, &c->system_instance, NULL }, { "system-instance", pa_config_parse_bool, &c->system_instance, NULL },
{ "no-cpu-limit", pa_config_parse_bool, &c->no_cpu_limit, NULL }, { "no-cpu-limit", pa_config_parse_bool, &c->no_cpu_limit, NULL },
{ "cpu-limit", pa_config_parse_not_bool, &c->no_cpu_limit, NULL },
{ "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL },
{ "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL },
{ "flat-volumes", pa_config_parse_bool, &c->flat_volumes, NULL }, { "flat-volumes", pa_config_parse_bool, &c->flat_volumes, NULL },
{ "lock-memory", pa_config_parse_bool, &c->lock_memory, NULL }, { "lock-memory", pa_config_parse_bool, &c->lock_memory, NULL },
{ "exit-idle-time", pa_config_parse_int, &c->exit_idle_time, NULL }, { "exit-idle-time", pa_config_parse_int, &c->exit_idle_time, NULL },
@ -465,7 +469,9 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
{ "default-fragment-size-msec", parse_fragment_size_msec, c, NULL }, { "default-fragment-size-msec", parse_fragment_size_msec, c, NULL },
{ "nice-level", parse_nice_level, c, NULL }, { "nice-level", parse_nice_level, c, NULL },
{ "disable-remixing", pa_config_parse_bool, &c->disable_remixing, NULL }, { "disable-remixing", pa_config_parse_bool, &c->disable_remixing, NULL },
{ "enable-remixing", pa_config_parse_not_bool, &c->disable_remixing, NULL },
{ "disable-lfe-remixing", pa_config_parse_bool, &c->disable_lfe_remixing, NULL }, { "disable-lfe-remixing", pa_config_parse_bool, &c->disable_lfe_remixing, NULL },
{ "enable-lfe-remixing", pa_config_parse_not_bool, &c->disable_lfe_remixing, NULL },
{ "load-default-script-file", pa_config_parse_bool, &c->load_default_script_file, NULL }, { "load-default-script-file", pa_config_parse_bool, &c->load_default_script_file, NULL },
{ "shm-size-bytes", pa_config_parse_size, &c->shm_size, NULL }, { "shm-size-bytes", pa_config_parse_size, &c->shm_size, NULL },
{ "log-meta", pa_config_parse_bool, &c->log_meta, NULL }, { "log-meta", pa_config_parse_bool, &c->log_meta, NULL },
@ -623,12 +629,12 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf_printf(s, "nice-level = %i\n", c->nice_level); pa_strbuf_printf(s, "nice-level = %i\n", c->nice_level);
pa_strbuf_printf(s, "realtime-scheduling = %s\n", pa_yes_no(c->realtime_scheduling)); pa_strbuf_printf(s, "realtime-scheduling = %s\n", pa_yes_no(c->realtime_scheduling));
pa_strbuf_printf(s, "realtime-priority = %i\n", c->realtime_priority); pa_strbuf_printf(s, "realtime-priority = %i\n", c->realtime_priority);
pa_strbuf_printf(s, "disallow-module-loading = %s\n", pa_yes_no(c->disallow_module_loading)); pa_strbuf_printf(s, "allow-module-loading = %s\n", pa_yes_no(!c->disallow_module_loading));
pa_strbuf_printf(s, "disallow-exit = %s\n", pa_yes_no(c->disallow_exit)); pa_strbuf_printf(s, "allow-exit = %s\n", pa_yes_no(!c->disallow_exit));
pa_strbuf_printf(s, "use-pid-file = %s\n", pa_yes_no(c->use_pid_file)); pa_strbuf_printf(s, "use-pid-file = %s\n", pa_yes_no(c->use_pid_file));
pa_strbuf_printf(s, "system-instance = %s\n", pa_yes_no(c->system_instance)); pa_strbuf_printf(s, "system-instance = %s\n", pa_yes_no(c->system_instance));
pa_strbuf_printf(s, "no-cpu-limit = %s\n", pa_yes_no(c->no_cpu_limit)); pa_strbuf_printf(s, "cpu-limit = %s\n", pa_yes_no(!c->no_cpu_limit));
pa_strbuf_printf(s, "disable-shm = %s\n", pa_yes_no(c->disable_shm)); 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, "flat-volumes = %s\n", pa_yes_no(c->flat_volumes));
pa_strbuf_printf(s, "lock-memory = %s\n", pa_yes_no(c->lock_memory)); 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, "exit-idle-time = %i\n", c->exit_idle_time);
@ -639,8 +645,8 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
pa_strbuf_printf(s, "log-target = %s\n", c->auto_log_target ? "auto" : (c->log_target == PA_LOG_SYSLOG ? "syslog" : "stderr")); pa_strbuf_printf(s, "log-target = %s\n", c->auto_log_target ? "auto" : (c->log_target == PA_LOG_SYSLOG ? "syslog" : "stderr"));
pa_strbuf_printf(s, "log-level = %s\n", log_level_to_string[c->log_level]); pa_strbuf_printf(s, "log-level = %s\n", log_level_to_string[c->log_level]);
pa_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method)); pa_strbuf_printf(s, "resample-method = %s\n", pa_resample_method_to_string(c->resample_method));
pa_strbuf_printf(s, "disable-remixing = %s\n", pa_yes_no(c->disable_remixing)); pa_strbuf_printf(s, "enable-remixing = %s\n", pa_yes_no(!c->disable_remixing));
pa_strbuf_printf(s, "disable-lfe-remixing = %s\n", pa_yes_no(c->disable_lfe_remixing)); pa_strbuf_printf(s, "enable-lfe-remixing = %s\n", pa_yes_no(!c->disable_lfe_remixing));
pa_strbuf_printf(s, "default-sample-format = %s\n", pa_sample_format_to_string(c->default_sample_spec.format)); pa_strbuf_printf(s, "default-sample-format = %s\n", pa_sample_format_to_string(c->default_sample_spec.format));
pa_strbuf_printf(s, "default-sample-rate = %u\n", c->default_sample_spec.rate); pa_strbuf_printf(s, "default-sample-rate = %u\n", c->default_sample_spec.rate);
pa_strbuf_printf(s, "default-sample-channels = %u\n", c->default_sample_spec.channels); pa_strbuf_printf(s, "default-sample-channels = %u\n", c->default_sample_spec.channels);

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

@ -21,14 +21,14 @@
; daemonize = no ; daemonize = no
; fail = yes ; fail = yes
; disallow-module-loading = no ; allow-module-loading = yes
; disallow-exit = no ; allow-exit = yes
; use-pid-file = yes ; use-pid-file = yes
; system-instance = no ; system-instance = no
; disable-shm = no ; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
; lock-memory = no ; lock-memory = no
; no-cpu-limit = no ; cpu-limit = yes
; high-priority = yes ; high-priority = yes
; nice-level = -11 ; nice-level = -11
@ -51,8 +51,8 @@
; log-backtrace = 0 ; log-backtrace = 0
; resample-method = speex-float-3 ; resample-method = speex-float-3
; disable-remixing = no ; enable-remixing = yes
; disable-lfe-remixing = yes ; enable-lfe-remixing = no
; flat-volumes = yes ; flat-volumes = yes

21
src/pulse/client-conf.c
View file

@ -92,16 +92,17 @@ int pa_client_conf_load(pa_client_conf *c, const char *filename) {
/* Prepare the configuration parse table */ /* Prepare the configuration parse table */
pa_config_item table[] = { pa_config_item table[] = {
{ "daemon-binary", pa_config_parse_string, &c->daemon_binary, NULL }, { "daemon-binary", pa_config_parse_string, &c->daemon_binary, NULL },
{ "extra-arguments", pa_config_parse_string, &c->extra_arguments, NULL }, { "extra-arguments", pa_config_parse_string, &c->extra_arguments, NULL },
{ "default-sink", pa_config_parse_string, &c->default_sink, NULL }, { "default-sink", pa_config_parse_string, &c->default_sink, NULL },
{ "default-source", pa_config_parse_string, &c->default_source, NULL }, { "default-source", pa_config_parse_string, &c->default_source, NULL },
{ "default-server", pa_config_parse_string, &c->default_server, NULL }, { "default-server", pa_config_parse_string, &c->default_server, NULL },
{ "autospawn", pa_config_parse_bool, &c->autospawn, NULL }, { "autospawn", pa_config_parse_bool, &c->autospawn, NULL },
{ "cookie-file", pa_config_parse_string, &c->cookie_file, NULL }, { "cookie-file", pa_config_parse_string, &c->cookie_file, NULL },
{ "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL }, { "disable-shm", pa_config_parse_bool, &c->disable_shm, NULL },
{ "shm-size-bytes", pa_config_parse_size, &c->shm_size, NULL }, { "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL },
{ NULL, NULL, NULL, NULL }, { "shm-size-bytes", pa_config_parse_size, &c->shm_size, NULL },
{ NULL, NULL, NULL, NULL },
}; };
if (filename) { if (filename) {

2
src/pulse/client.conf.in
View file

@ -29,5 +29,5 @@
; cookie-file = ; cookie-file =
; disable-shm = no ; enable-shm = yes
; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB ; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB