diff options
Diffstat (limited to 'src/pulsecore/proplist-util.c')
| -rw-r--r-- | src/pulsecore/proplist-util.c | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/src/pulsecore/proplist-util.c b/src/pulsecore/proplist-util.c index 4920c27e..8a447cf7 100644 --- a/src/pulsecore/proplist-util.c +++ b/src/pulsecore/proplist-util.c @@ -27,6 +27,13 @@ #include <locale.h> #include <dlfcn.h> +#ifdef __APPLE__ +#include <crt_externs.h> +#define environ (*_NSGetEnviron()) +#elif !HAVE_DECL_ENVIRON +extern char **environ; +#endif + #include <pulse/proplist.h> #include <pulse/utf8.h> #include <pulse/xmalloc.h> @@ -37,10 +44,8 @@ #include "proplist-util.h" void pa_init_proplist(pa_proplist *p) { -#if !HAVE_DECL_ENVIRON - extern char **environ; -#endif char **e; + const char *pp; pa_assert(p); @@ -64,17 +69,21 @@ void pa_init_proplist(pa_proplist *p) { k = pa_xstrndup(*e+11, kl); - if (pa_proplist_contains(p, k)) { - pa_xfree(k); - continue; - } - pa_proplist_sets(p, k, *e+11+kl+1); pa_xfree(k); } } } + if ((pp = getenv("PULSE_PROP"))) { + pa_proplist *t; + + if ((t = pa_proplist_from_string(pp))) { + pa_proplist_update(p, PA_UPDATE_REPLACE, t); + pa_proplist_free(t); + } + } + if (!pa_proplist_contains(p, PA_PROP_APPLICATION_PROCESS_ID)) { char t[32]; pa_snprintf(t, sizeof(t), "%lu", (unsigned long) getpid()); |