mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-01 22:58:47 -04:00
Perfer client.conf over X11 property variables.
To explain: X11 properties are always set on the root window if pulseaudio is started during X11 login (which is the most likey time to start it). This means that any settings specified in client.conf will almost never be used. As the default client.conf is empty it makes more sense to listen to it if a user cares to bother altering it. git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2494 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
9a501ef28e
commit
78ae61217d
1 changed files with 1 additions and 1 deletions
|
|
@ -177,10 +177,10 @@ 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, NULL);
|
||||
#ifdef HAVE_X11
|
||||
pa_client_conf_from_x11(c->conf, NULL);
|
||||
#endif
|
||||
pa_client_conf_load(c->conf, NULL);
|
||||
pa_client_conf_env(c->conf);
|
||||
|
||||
if (!(c->mempool = pa_mempool_new(!c->conf->disable_shm))) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue