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

main, core: check idle after loading conf

Browse source 
pa_core_check_idle() uses pa_core.exit_idle_time, which is set after the
pa_core_new() call, so pa_core_check_idle() needs to be called later.

This patch preserves the fact that core state is set to PA_CORE_RUNNING
after checking idle (now in main). It doesn't seem to matter anyway and
main(pa_core_new(state:PA_CORE_STARTUP)->...->state:PA_CORE_RUNNING)
seems right as well.
This commit is contained in:
Tom Yan 2020-08-16 20:16:01 +00:00 • committed by Tanu Kaskinen
parent 90a6c5ef07
commit e36132b7dc
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/daemon/main.c
View file

@ -1067,6 +1067,10 @@ int main(int argc, char *argv[]) {
c->server_type = conf->local_server_type; c->server_type = conf->local_server_type;
#endif #endif
pa_core_check_idle(c);
c->state = PA_CORE_RUNNING;
pa_cpu_init(&c->cpu_info); pa_cpu_init(&c->cpu_info);
pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0); pa_assert_se(pa_signal_init(pa_mainloop_get_api(mainloop)) == 0);

4
src/pulsecore/core.c
View file

@ -159,10 +159,6 @@ pa_core* pa_core_new(pa_mainloop_api *m, bool shared, bool enable_memfd, size_t
pa_check_signal_is_blocked(SIGPIPE); pa_check_signal_is_blocked(SIGPIPE);
#endif #endif
pa_core_check_idle(c);
c->state = PA_CORE_RUNNING;
return c; return c;
} }