mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
volume: Rename 'sync volume' to 'deferred volume'.
This just covers Lennart's concern over the terminology used. The majority of this change is simply the following command: grep -rli sync[-_]volume . | xargs sed -i 's/sync_volume/deferred_volume/g;s/PA_SINK_SYNC_VOLUME/PA_SINK_DEFERRED_VOLUME/g;s/PA_SOURCE_SYNC_VOLUME/PA_SOURCE_DEFERRED_VOLUME/g;s/sync-volume/deferred-volume/g' Some minor tweaks were added on top to tidy up formatting and a couple of phrases were clarified too.
This commit is contained in:
Colin Guthrie
parent
83577aa373
commit
aa3142ab20
20 changed files with 143 additions and 141 deletions
|
|
@ -95,11 +95,11 @@ static const pa_daemon_conf default_conf = {
|
|||
.no_cpu_limit = TRUE,
|
||||
.disable_shm = FALSE,
|
||||
.lock_memory = FALSE,
|
||||
.sync_volume = TRUE,
|
||||
.deferred_volume = TRUE,
|
||||
.default_n_fragments = 4,
|
||||
.default_fragment_size_msec = 25,
|
||||
.sync_volume_safety_margin_usec = 8000,
|
||||
.sync_volume_extra_delay_usec = 0,
|
||||
.deferred_volume_safety_margin_usec = 8000,
|
||||
.deferred_volume_extra_delay_usec = 0,
|
||||
.default_sample_spec = { .format = PA_SAMPLE_S16NE, .rate = 44100, .channels = 2 },
|
||||
.default_channel_map = { .channels = 2, .map = { PA_CHANNEL_POSITION_LEFT, PA_CHANNEL_POSITION_RIGHT } },
|
||||
.shm_size = 0
|
||||
|
|
@ -536,7 +536,7 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
|
|||
{ "enable-shm", pa_config_parse_not_bool, &c->disable_shm, NULL },
|
||||
{ "flat-volumes", pa_config_parse_bool, &c->flat_volumes, NULL },
|
||||
{ "lock-memory", pa_config_parse_bool, &c->lock_memory, NULL },
|
||||
{ "enable-sync-volume", pa_config_parse_bool, &c->sync_volume, NULL },
|
||||
{ "enable-deferred-volume", pa_config_parse_bool, &c->deferred_volume, NULL },
|
||||
{ "exit-idle-time", pa_config_parse_int, &c->exit_idle_time, NULL },
|
||||
{ "scache-idle-time", pa_config_parse_int, &c->scache_idle_time, NULL },
|
||||
{ "realtime-priority", parse_rtprio, c, NULL },
|
||||
|
|
@ -552,8 +552,10 @@ int pa_daemon_conf_load(pa_daemon_conf *c, const char *filename) {
|
|||
{ "default-channel-map", parse_channel_map, &ci, NULL },
|
||||
{ "default-fragments", parse_fragments, c, NULL },
|
||||
{ "default-fragment-size-msec", parse_fragment_size_msec, c, NULL },
|
||||
{ "sync-volume-safety-margin-usec", pa_config_parse_unsigned, &c->sync_volume_safety_margin_usec, NULL },
|
||||
{ "sync-volume-extra-delay-usec", pa_config_parse_int, &c->sync_volume_extra_delay_usec, NULL },
|
||||
{ "deferred-volume-safety-margin-usec",
|
||||
pa_config_parse_unsigned, &c->deferred_volume_safety_margin_usec, NULL },
|
||||
{ "deferred-volume-extra-delay-usec",
|
||||
pa_config_parse_int, &c->deferred_volume_extra_delay_usec, NULL },
|
||||
{ "nice-level", parse_nice_level, c, NULL },
|
||||
{ "disable-remixing", pa_config_parse_bool, &c->disable_remixing, NULL },
|
||||
{ "enable-remixing", pa_config_parse_not_bool, &c->disable_remixing, NULL },
|
||||
|
|
@ -737,7 +739,6 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
|
|||
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, "lock-memory = %s\n", pa_yes_no(c->lock_memory));
|
||||
pa_strbuf_printf(s, "enable-sync-volume = %s\n", pa_yes_no(c->sync_volume));
|
||||
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);
|
||||
pa_strbuf_printf(s, "dl-search-path = %s\n", pa_strempty(c->dl_search_path));
|
||||
|
|
@ -754,8 +755,9 @@ char *pa_daemon_conf_dump(pa_daemon_conf *c) {
|
|||
pa_strbuf_printf(s, "default-channel-map = %s\n", pa_channel_map_snprint(cm, sizeof(cm), &c->default_channel_map));
|
||||
pa_strbuf_printf(s, "default-fragments = %u\n", c->default_n_fragments);
|
||||
pa_strbuf_printf(s, "default-fragment-size-msec = %u\n", c->default_fragment_size_msec);
|
||||
pa_strbuf_printf(s, "sync-volume-safety-margin-usec = %u\n", c->sync_volume_safety_margin_usec);
|
||||
pa_strbuf_printf(s, "sync-volume-extra-delay-usec = %d\n", c->sync_volume_extra_delay_usec);
|
||||
pa_strbuf_printf(s, "enable-deferred-volume = %s\n", pa_yes_no(c->deferred_volume));
|
||||
pa_strbuf_printf(s, "deferred-volume-safety-margin-usec = %u\n", c->deferred_volume_safety_margin_usec);
|
||||
pa_strbuf_printf(s, "deferred-volume-extra-delay-usec = %d\n", c->deferred_volume_extra_delay_usec);
|
||||
pa_strbuf_printf(s, "shm-size-bytes = %lu\n", (unsigned long) c->shm_size);
|
||||
pa_strbuf_printf(s, "log-meta = %s\n", pa_yes_no(c->log_meta));
|
||||
pa_strbuf_printf(s, "log-time = %s\n", pa_yes_no(c->log_time));
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ typedef struct pa_daemon_conf {
|
|||
log_time,
|
||||
flat_volumes,
|
||||
lock_memory,
|
||||
sync_volume;
|
||||
deferred_volume;
|
||||
pa_server_type_t local_server_type;
|
||||
int exit_idle_time,
|
||||
scache_idle_time,
|
||||
|
|
@ -128,8 +128,8 @@ typedef struct pa_daemon_conf {
|
|||
#endif
|
||||
|
||||
unsigned default_n_fragments, default_fragment_size_msec;
|
||||
unsigned sync_volume_safety_margin_usec;
|
||||
int sync_volume_extra_delay_usec;
|
||||
unsigned deferred_volume_safety_margin_usec;
|
||||
int deferred_volume_extra_delay_usec;
|
||||
pa_sample_spec default_sample_spec;
|
||||
pa_channel_map default_channel_map;
|
||||
size_t shm_size;
|
||||
|
|
|
|||
|
|
@ -86,6 +86,6 @@ ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl
|
|||
; default-fragments = 4
|
||||
; default-fragment-size-msec = 25
|
||||
|
||||
; enable-sync-volume = yes
|
||||
; sync-volume-safety-margin-usec = 8000
|
||||
; sync-volume-extra-delay-usec = 0
|
||||
; enable-deferred-volume = yes
|
||||
; deferred-volume-safety-margin-usec = 8000
|
||||
; deferred-volume-extra-delay-usec = 0
|
||||
|
|
|
|||
|
|
@ -1016,8 +1016,8 @@ int main(int argc, char *argv[]) {
|
|||
c->default_channel_map = conf->default_channel_map;
|
||||
c->default_n_fragments = conf->default_n_fragments;
|
||||
c->default_fragment_size_msec = conf->default_fragment_size_msec;
|
||||
c->sync_volume_safety_margin_usec = conf->sync_volume_safety_margin_usec;
|
||||
c->sync_volume_extra_delay_usec = conf->sync_volume_extra_delay_usec;
|
||||
c->deferred_volume_safety_margin_usec = conf->deferred_volume_safety_margin_usec;
|
||||
c->deferred_volume_extra_delay_usec = conf->deferred_volume_extra_delay_usec;
|
||||
c->exit_idle_time = conf->exit_idle_time;
|
||||
c->scache_idle_time = conf->scache_idle_time;
|
||||
c->resample_method = conf->resample_method;
|
||||
|
|
@ -1025,7 +1025,7 @@ int main(int argc, char *argv[]) {
|
|||
c->realtime_scheduling = !!conf->realtime_scheduling;
|
||||
c->disable_remixing = !!conf->disable_remixing;
|
||||
c->disable_lfe_remixing = !!conf->disable_lfe_remixing;
|
||||
c->sync_volume = !!conf->sync_volume;
|
||||
c->deferred_volume = !!conf->deferred_volume;
|
||||
c->running_as_daemon = !!conf->daemonize;
|
||||
c->disallow_exit = conf->disallow_exit;
|
||||
c->flat_volumes = conf->flat_volumes;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue