From 18c57efb3975920434d2c4b6a10901c72cf2d04f Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 9 Nov 2020 09:41:12 +0100 Subject: [PATCH] pulse-server: take type from info --- src/modules/module-protocol-pulse/manager.c | 3 +-- src/modules/module-protocol-pulse/manager.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/module-protocol-pulse/manager.c b/src/modules/module-protocol-pulse/manager.c index af8304d17..1f2c279be 100644 --- a/src/modules/module-protocol-pulse/manager.c +++ b/src/modules/module-protocol-pulse/manager.c @@ -133,7 +133,6 @@ static void object_destroy(struct object *o) spa_hook_remove(&o->proxy_listener); pw_proxy_destroy(o->this.proxy); } - free(o->this.type); if (o->this.props) pw_properties_free(o->this.props); clear_params(&o->this.param_list, SPA_ID_INVALID); @@ -460,7 +459,7 @@ static void registry_event_global(void *data, uint32_t id, } o->this.id = id; o->this.permissions = permissions; - o->this.type = strdup(type); + o->this.type = info->type; o->this.version = version; o->this.props = props ? pw_properties_new_dict(props) : NULL; o->this.proxy = proxy; diff --git a/src/modules/module-protocol-pulse/manager.h b/src/modules/module-protocol-pulse/manager.h index 082389b8c..29d0e4433 100644 --- a/src/modules/module-protocol-pulse/manager.h +++ b/src/modules/module-protocol-pulse/manager.h @@ -74,7 +74,7 @@ struct pw_manager_object { struct spa_list link; /**< link in manager object_list */ uint32_t id; uint32_t permissions; - char *type; + const char *type; uint32_t version; struct pw_properties *props; struct pw_proxy *proxy;