small cleanups

This commit is contained in:
Wim Taymans 2019-12-11 16:51:38 +01:00
parent 3805d5dfa2
commit d99b1918ed
4 changed files with 9 additions and 9 deletions

View file

@ -1284,7 +1284,7 @@ static void check_endpoint_link(struct endpoint_link *link)
} }
} }
static void link_proxy_destroy(void *data) static void proxy_link_destroy(void *data)
{ {
struct link *l = data; struct link *l = data;
@ -1295,9 +1295,9 @@ static void link_proxy_destroy(void *data)
} }
} }
static const struct pw_proxy_events link_proxy_events = { static const struct pw_proxy_events proxy_link_events = {
PW_VERSION_PROXY_EVENTS, PW_VERSION_PROXY_EVENTS,
.destroy = link_proxy_destroy .destroy = proxy_link_destroy
}; };
static int link_nodes(struct impl *impl, struct endpoint_link *link, static int link_nodes(struct impl *impl, struct endpoint_link *link,
@ -1343,7 +1343,7 @@ static int link_nodes(struct impl *impl, struct endpoint_link *link,
l->output_port = outport->obj.id; l->output_port = outport->obj.id;
l->input_node = innode->obj.id; l->input_node = innode->obj.id;
l->input_port = inport->obj.id; l->input_port = inport->obj.id;
pw_proxy_add_listener(p, &l->listener, &link_proxy_events, l); pw_proxy_add_listener(p, &l->listener, &proxy_link_events, l);
if (link) { if (link) {
l->endpoint_link = link; l->endpoint_link = link;

View file

@ -481,7 +481,7 @@ static int rescan_endpoint(struct impl *impl, struct endpoint *ep)
else { else {
str = spa_dict_lookup(props, PW_KEY_NODE_DONT_RECONNECT); str = spa_dict_lookup(props, PW_KEY_NODE_DONT_RECONNECT);
if (str != NULL && pw_properties_parse_bool(str)) { if (str != NULL && pw_properties_parse_bool(str)) {
// pw_registry_proxy_destroy(impl->registry_proxy, ep->id); // pw_registry_destroy(impl->registry, ep->id);
return -ENOENT; return -ENOENT;
} }
} }

View file

@ -41,7 +41,7 @@ struct device_data {
struct spa_hook proxy_listener; struct spa_hook proxy_listener;
}; };
static void device_proxy_destroy(void *_data) static void proxy_device_destroy(void *_data)
{ {
struct device_data *data = _data; struct device_data *data = _data;
spa_hook_remove(&data->device_listener); spa_hook_remove(&data->device_listener);
@ -49,7 +49,7 @@ static void device_proxy_destroy(void *_data)
static const struct pw_proxy_events proxy_events = { static const struct pw_proxy_events proxy_events = {
PW_VERSION_PROXY_EVENTS, PW_VERSION_PROXY_EVENTS,
.destroy = device_proxy_destroy, .destroy = proxy_device_destroy,
}; };
struct pw_proxy *pw_core_spa_device_export(struct pw_core *core, struct pw_proxy *pw_core_spa_device_export(struct pw_core *core,

View file

@ -41,7 +41,7 @@ struct object_data {
struct spa_hook proxy_listener; struct spa_hook proxy_listener;
}; };
static void object_proxy_destroy(void *_data) static void proxy_object_destroy(void *_data)
{ {
struct object_data *data = _data; struct object_data *data = _data;
spa_hook_remove(&data->object_listener); spa_hook_remove(&data->object_listener);
@ -49,7 +49,7 @@ static void object_proxy_destroy(void *_data)
static const struct pw_proxy_events proxy_events = { static const struct pw_proxy_events proxy_events = {
PW_VERSION_PROXY_EVENTS, PW_VERSION_PROXY_EVENTS,
.destroy = object_proxy_destroy, .destroy = proxy_object_destroy,
}; };
struct pw_proxy *pw_core_metadata_export(struct pw_core *core, struct pw_proxy *pw_core_metadata_export(struct pw_core *core,