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

client-conf: Move x11 and env loading to pa_client_conf_load()

Browse source 
This simplifies the code a bit.
This commit is contained in:
Tanu Kaskinen 2014-06-08 16:32:54 +03:00
parent 067e61cb66
commit 5141188ca8
6 changed files with 58 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/pulse/context.c
View file

@ -48,9 +48,6 @@
#include <pulse/timeval.h>
#include <pulse/fork-detect.h>
#include <pulse/client-conf.h>
#ifdef HAVE_X11
#include <pulse/client-conf-x11.h>
#endif
#include <pulsecore/core-error.h>
#include <pulsecore/i18n.h>
@ -166,11 +163,7 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char *
#endif
c->conf = pa_client_conf_new();
pa_client_conf_load(c->conf);
#ifdef HAVE_X11
pa_client_conf_from_x11(c->conf);
#endif
pa_client_conf_env(c->conf);
pa_client_conf_load(c->conf, true, true);
if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm, c->conf->shm_size))) {