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

pulse: don't leak device_name

Browse source 
Small cleanups
This commit is contained in:
Wim Taymans 2020-08-19 16:47:52 +02:00
parent 1f298cb5bf
commit 4e17d4cdf8
2 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pipewire-pulseaudio/src/context.c
View file

@ -1183,6 +1183,8 @@ static int set_mask(pa_context *c, struct global *g)
g->event = PA_SUBSCRIPTION_EVENT_CLIENT; g->event = PA_SUBSCRIPTION_EVENT_CLIENT;
ginfo = &client_info; ginfo = &client_info;
} else if (strcmp(g->type, PW_TYPE_INTERFACE_Link) == 0) { } else if (strcmp(g->type, PW_TYPE_INTERFACE_Link) == 0) {
uint32_t src_node_id, dst_node_id;
if ((str = pw_properties_get(g->props, PW_KEY_LINK_OUTPUT_PORT)) == NULL) if ((str = pw_properties_get(g->props, PW_KEY_LINK_OUTPUT_PORT)) == NULL)
return 0; return 0;
g->link_info.src = pa_context_find_global(c, pw_properties_parse_int(str)); g->link_info.src = pa_context_find_global(c, pw_properties_parse_int(str));
@ -1193,17 +1195,18 @@ static int set_mask(pa_context *c, struct global *g)
if (g->link_info.src == NULL || g->link_info.dst == NULL) if (g->link_info.src == NULL || g->link_info.dst == NULL)
return 0; return 0;
pw_log_debug("link %d:%d->%d:%d", src_node_id = g->link_info.src->port_info.node_id;
g->link_info.src->port_info.node_id, dst_node_id = g->link_info.dst->port_info.node_id;
g->link_info.src->id,
g->link_info.dst->port_info.node_id,
g->link_info.dst->id);
if ((f = pa_context_find_global(c, g->link_info.src->port_info.node_id)) != NULL && pw_log_debug("link %d:%d->%d:%d",
!f->init) src_node_id, g->link_info.src->id,
dst_node_id, g->link_info.dst->id);
f = pa_context_find_global(c, src_node_id);
if (f != NULL && !f->init)
emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE); emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE);
if ((f = pa_context_find_global(c, g->link_info.dst->port_info.node_id)) != NULL && f = pa_context_find_global(c, dst_node_id);
!f->init) if (f != NULL && !f->init)
emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE); emit_event(c, f, PA_SUBSCRIPTION_EVENT_CHANGE);
} else if (strcmp(g->type, PW_TYPE_INTERFACE_Metadata) == 0) { } else if (strcmp(g->type, PW_TYPE_INTERFACE_Metadata) == 0) {

1
pipewire-pulseaudio/src/stream.c
View file

@ -78,6 +78,7 @@ static void configure_device(pa_stream *s)
s->device_index = g->id; s->device_index = g->id;
} }
free(s->device_name);
if ((str = pw_properties_get(g->props, PW_KEY_NODE_NAME)) == NULL) if ((str = pw_properties_get(g->props, PW_KEY_NODE_NAME)) == NULL)
s->device_name = strdup("unknown"); s->device_name = strdup("unknown");
else else