mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-01 22:58:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse-server: take type from info

Browse source
This commit is contained in:
Wim Taymans 2020-11-09 09:41:12 +01:00
parent b6efcd90a7
commit 18c57efb39
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/module-protocol-pulse/manager.c
View file

@ -133,7 +133,6 @@ static void object_destroy(struct object *o)
spa_hook_remove(&o->proxy_listener); spa_hook_remove(&o->proxy_listener);
pw_proxy_destroy(o->this.proxy); pw_proxy_destroy(o->this.proxy);
} }
free(o->this.type);
if (o->this.props) if (o->this.props)
pw_properties_free(o->this.props); pw_properties_free(o->this.props);
clear_params(&o->this.param_list, SPA_ID_INVALID); 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.id = id;
o->this.permissions = permissions; o->this.permissions = permissions;
o->this.type = strdup(type); o->this.type = info->type;
o->this.version = version; o->this.version = version;
o->this.props = props ? pw_properties_new_dict(props) : NULL; o->this.props = props ? pw_properties_new_dict(props) : NULL;
o->this.proxy = proxy; o->this.proxy = proxy;

2
src/modules/module-protocol-pulse/manager.h
View file

@ -74,7 +74,7 @@ struct pw_manager_object {
struct spa_list link; /**< link in manager object_list */ struct spa_list link; /**< link in manager object_list */
uint32_t id; uint32_t id;
uint32_t permissions; uint32_t permissions;
char *type; const char *type;
uint32_t version; uint32_t version;
struct pw_properties *props; struct pw_properties *props;
struct pw_proxy *proxy; struct pw_proxy *proxy;