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

Cleanups

Browse source
This commit is contained in:
Wim Taymans 2017-06-29 12:53:10 +02:00
parent a1fdfdc818
commit 7297c18839
4 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pipewire/server/link.c
View file

@ -892,7 +892,6 @@ struct pw_link *pw_link_new(struct pw_core *core,
pw_signal_init(&this->port_unlinked); pw_signal_init(&this->port_unlinked);
pw_signal_init(&this->state_changed); pw_signal_init(&this->state_changed);
pw_signal_init(&this->destroy_signal); pw_signal_init(&this->destroy_signal);
pw_signal_init(&this->free_signal);
impl->format_filter = format_filter; impl->format_filter = format_filter;
@ -1007,9 +1006,6 @@ void pw_link_destroy(struct pw_link *link)
link->output = NULL; link->output = NULL;
} }
pw_log_debug("link %p: free", link);
pw_signal_emit(&link->free_signal, link);
pw_work_queue_destroy(impl->work); pw_work_queue_destroy(impl->work);
if (link->info.format) if (link->info.format)

2
pipewire/server/link.h
View file

@ -65,8 +65,6 @@ struct pw_link {
/** Emited when the link is destroyed */ /** Emited when the link is destroyed */
PW_SIGNAL(destroy_signal, (struct pw_listener *, struct pw_link *)); PW_SIGNAL(destroy_signal, (struct pw_listener *, struct pw_link *));
/** Emited when the object is freed */
PW_SIGNAL(free_signal, (struct pw_listener *, struct pw_link *));
struct spa_list resource_list; /**< list of bound resources */ struct spa_list resource_list; /**< list of bound resources */

4
pipewire/server/node.c
View file

@ -725,8 +725,8 @@ struct pw_port *pw_node_get_free_port(struct pw_node *node, enum pw_direction di
if (!spa_list_is_empty(ports)) { if (!spa_list_is_empty(ports)) {
port = spa_list_first(ports, struct pw_port, link); port = spa_list_first(ports, struct pw_port, link);
/* for output we can reuse an existing port, for input only /* for output we can reuse an existing port, for input only
* when there is a mixer */ * when there is a multiplex */
if (direction == PW_DIRECTION_INPUT && port->mixer == NULL) if (direction == PW_DIRECTION_INPUT && port->multiplex == NULL)
port = NULL; port = NULL;
} }
} }

2
pipewire/server/port.h
View file

@ -72,7 +72,7 @@ struct pw_port {
struct spa_list links; /**< list of \ref pw_link */ struct spa_list links; /**< list of \ref pw_link */
void *mixer; /**< optional port buffer mixer */ void *multiplex; /**< optional port buffer mix/split */
struct { struct {
struct spa_list links; /**< list of \ref pw_link only accessed from the struct spa_list links; /**< list of \ref pw_link only accessed from the