diff --git a/pipewire/server/link.c b/pipewire/server/link.c index 3c02ca19b..5f62d7c57 100644 --- a/pipewire/server/link.c +++ b/pipewire/server/link.c @@ -892,7 +892,6 @@ struct pw_link *pw_link_new(struct pw_core *core, pw_signal_init(&this->port_unlinked); pw_signal_init(&this->state_changed); pw_signal_init(&this->destroy_signal); - pw_signal_init(&this->free_signal); impl->format_filter = format_filter; @@ -1007,9 +1006,6 @@ void pw_link_destroy(struct pw_link *link) link->output = NULL; } - pw_log_debug("link %p: free", link); - pw_signal_emit(&link->free_signal, link); - pw_work_queue_destroy(impl->work); if (link->info.format) diff --git a/pipewire/server/link.h b/pipewire/server/link.h index a3a4411a3..d9be699d2 100644 --- a/pipewire/server/link.h +++ b/pipewire/server/link.h @@ -65,8 +65,6 @@ struct pw_link { /** Emited when the link is destroyed */ 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 */ diff --git a/pipewire/server/node.c b/pipewire/server/node.c index 4ce63d90f..f69cd8f8f 100644 --- a/pipewire/server/node.c +++ b/pipewire/server/node.c @@ -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)) { port = spa_list_first(ports, struct pw_port, link); /* for output we can reuse an existing port, for input only - * when there is a mixer */ - if (direction == PW_DIRECTION_INPUT && port->mixer == NULL) + * when there is a multiplex */ + if (direction == PW_DIRECTION_INPUT && port->multiplex == NULL) port = NULL; } } diff --git a/pipewire/server/port.h b/pipewire/server/port.h index a1b6b9fb2..bcd0babef 100644 --- a/pipewire/server/port.h +++ b/pipewire/server/port.h @@ -72,7 +72,7 @@ struct pw_port { struct spa_list links; /**< list of \ref pw_link */ - void *mixer; /**< optional port buffer mixer */ + void *multiplex; /**< optional port buffer mix/split */ struct { struct spa_list links; /**< list of \ref pw_link only accessed from the