diff options
Diffstat (limited to 'src/pulsecore/x11wrap.c')
| -rw-r--r-- | src/pulsecore/x11wrap.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 00b6a157..17f8e6a4 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -29,7 +29,7 @@ #include <pulsecore/llist.h> #include <pulsecore/log.h> -#include <pulsecore/props.h> +#include <pulsecore/shared.h> #include <pulsecore/core-util.h> #include <pulsecore/macro.h> @@ -192,7 +192,7 @@ static pa_x11_wrapper* x11_wrapper_new(pa_core *c, const char *name, const char XAddConnectionWatch(d, x11_watch, (XPointer) w); - pa_assert_se(pa_property_set(c, w->property_name, w) >= 0); + pa_assert_se(pa_shared_set(c, w->property_name, w) >= 0); return w; } @@ -200,7 +200,7 @@ static pa_x11_wrapper* x11_wrapper_new(pa_core *c, const char *name, const char static void x11_wrapper_free(pa_x11_wrapper*w) { pa_assert(w); - pa_assert_se(pa_property_remove(w->core, w->property_name) >= 0); + pa_assert_se(pa_shared_remove(w->core, w->property_name) >= 0); pa_assert(!w->clients); @@ -223,8 +223,9 @@ pa_x11_wrapper* pa_x11_wrapper_get(pa_core *c, const char *name) { pa_core_assert_ref(c); - pa_snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "-" : "", name ? name : ""); - if ((w = pa_property_get(c, t))) + pa_snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "@" : "", name ? name : ""); + + if ((w = pa_shared_get(c, t))) return pa_x11_wrapper_ref(w); return x11_wrapper_new(c, name, t); @@ -242,8 +243,10 @@ void pa_x11_wrapper_unref(pa_x11_wrapper* w) { pa_assert(w); pa_assert(PA_REFCNT_VALUE(w) >= 1); - if (PA_REFCNT_DEC(w) <= 0) - x11_wrapper_free(w); + if (PA_REFCNT_DEC(w) > 0) + return; + + x11_wrapper_free(w); } Display *pa_x11_wrapper_get_display(pa_x11_wrapper *w) { |