From 61e4ad3b4119a45ffcae5db39548a6a315fe5301 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Thu, 30 Aug 2018 12:35:14 +0200 Subject: [PATCH] control: always link notify and control controls --- src/modules/module-client-node/client-stream.c | 12 ++++-------- src/modules/module-media-session.c | 12 ++++-------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/src/modules/module-client-node/client-stream.c b/src/modules/module-client-node/client-stream.c index beb88bcc3..cbd4291e0 100644 --- a/src/modules/module-client-node/client-stream.c +++ b/src/modules/module-client-node/client-stream.c @@ -559,18 +559,14 @@ static void try_link_controls(struct impl *impl, struct pw_port *port, struct pw pw_log_debug("module %p: trying controls", impl); spa_list_for_each(cout, &port->control_list[SPA_DIRECTION_OUTPUT], port_link) { spa_list_for_each(cin, &target->control_list[SPA_DIRECTION_INPUT], port_link) { - if (cin->id != cout->id) { - if ((res = pw_control_link(cout, cin)) < 0) - pw_log_error("failed to link controls: %s", spa_strerror(res)); - } + if ((res = pw_control_link(cout, cin)) < 0) + pw_log_error("failed to link controls: %s", spa_strerror(res)); } } spa_list_for_each(cin, &port->control_list[SPA_DIRECTION_INPUT], port_link) { spa_list_for_each(cout, &target->control_list[SPA_DIRECTION_OUTPUT], port_link) { - if (cin->id != cout->id) { - if ((res = pw_control_link(cout, cin)) < 0) - pw_log_error("failed to link controls: %s", spa_strerror(res)); - } + if ((res = pw_control_link(cout, cin)) < 0) + pw_log_error("failed to link controls: %s", spa_strerror(res)); } } } diff --git a/src/modules/module-media-session.c b/src/modules/module-media-session.c index 2666cc03f..4c49f3e6a 100644 --- a/src/modules/module-media-session.c +++ b/src/modules/module-media-session.c @@ -212,18 +212,14 @@ static void try_link_controls(struct impl *impl, struct pw_port *port, struct pw pw_log_debug("module %p: trying controls", impl); spa_list_for_each(cout, &port->control_list[SPA_DIRECTION_OUTPUT], port_link) { spa_list_for_each(cin, &target->control_list[SPA_DIRECTION_INPUT], port_link) { - if (cin->id != cout->id) { - if ((res = pw_control_link(cout, cin)) < 0) - pw_log_error("failed to link controls: %s", spa_strerror(res)); - } + if ((res = pw_control_link(cout, cin)) < 0) + pw_log_error("failed to link controls: %s", spa_strerror(res)); } } spa_list_for_each(cin, &port->control_list[SPA_DIRECTION_INPUT], port_link) { spa_list_for_each(cout, &target->control_list[SPA_DIRECTION_OUTPUT], port_link) { - if (cin->id != cout->id) { - if ((res = pw_control_link(cout, cin)) < 0) - pw_log_error("failed to link controls: %s", spa_strerror(res)); - } + if ((res = pw_control_link(cout, cin)) < 0) + pw_log_error("failed to link controls: %s", spa_strerror(res)); } }