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

reorder initialization of pa_core variables

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1732 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-30 22:44:19 +00:00
parent ca72adf100
commit b552541dd1
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/daemon/main.c
View file

@ -604,6 +604,11 @@ int main(int argc, char *argv[]) {
c->default_sample_spec = conf->default_sample_spec; c->default_sample_spec = conf->default_sample_spec;
c->default_n_fragments = conf->default_n_fragments; c->default_n_fragments = conf->default_n_fragments;
c->default_fragment_size_msec = conf->default_fragment_size_msec; c->default_fragment_size_msec = conf->default_fragment_size_msec;
c->disallow_module_loading = conf->disallow_module_loading;
c->exit_idle_time = conf->exit_idle_time;
c->module_idle_time = conf->module_idle_time;
c->scache_idle_time = conf->scache_idle_time;
c->resample_method = conf->resample_method;
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0); pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);
pa_signal_new(SIGINT, signal_callback, c); pa_signal_new(SIGINT, signal_callback, c);
@ -634,7 +639,7 @@ int main(int argc, char *argv[]) {
r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop)); r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
assert(r == 0); assert(r == 0);
} }
buf = pa_strbuf_new(); buf = pa_strbuf_new();
if (conf->default_script_file) if (conf->default_script_file)
r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail); r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail);
@ -664,12 +669,6 @@ int main(int argc, char *argv[]) {
pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL); pa_loop_write(daemon_pipe[1], &retval, sizeof(retval), NULL);
#endif #endif
c->disallow_module_loading = conf->disallow_module_loading;
c->exit_idle_time = conf->exit_idle_time;
c->module_idle_time = conf->module_idle_time;
c->scache_idle_time = conf->scache_idle_time;
c->resample_method = conf->resample_method;
if (c->default_sink_name && if (c->default_sink_name &&
pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) { pa_namereg_get(c, c->default_sink_name, PA_NAMEREG_SINK, 1) == NULL) {
pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name); pa_log_error("%s : Fatal error. Default sink name (%s) does not exist in name register.", __FILE__, c->default_sink_name);