From 935de18aa5b4d4a73513afdc80ef62c0aa4126e5 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Mon, 12 Aug 2019 16:50:10 +0200 Subject: [PATCH] port: return async result from use_buffers if any --- src/modules/module-client-node/client-node.c | 4 ++-- src/pipewire/port.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/module-client-node/client-node.c b/src/modules/module-client-node/client-node.c index 7a25e00d5..ce1037776 100644 --- a/src/modules/module-client-node/client-node.c +++ b/src/modules/module-client-node/client-node.c @@ -709,9 +709,9 @@ do_port_use_buffers(struct impl *impl, uint32_t i, j; struct pw_client_node_buffer *mb; - spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u", impl, + spa_log_debug(this->log, NAME " %p: %s port %d.%d use buffers %p %u flags:%08x", impl, direction == SPA_DIRECTION_INPUT ? "input" : "output", - port_id, mix_id, buffers, n_buffers); + port_id, mix_id, buffers, n_buffers, flags); spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL); diff --git a/src/pipewire/port.c b/src/pipewire/port.c index a28b2db04..e1ea3fdb0 100644 --- a/src/pipewire/port.c +++ b/src/pipewire/port.c @@ -1107,6 +1107,8 @@ int pw_port_use_buffers(struct pw_port *port, struct pw_port_mix *mix, uint32_t pw_log_warn(NAME" %p: mix use buffers failed: %d (%s)", port, res2, spa_strerror(res2)); } + if (SPA_RESULT_IS_ASYNC(res2)) + res = res2; return res; }