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

client-node: don't error in cleanup

Browse source 
It's possible the cleanup code might try to clean up ports we
already removed, don't show an error on that.
This commit is contained in:
Wim Taymans 2020-04-28 13:56:23 +02:00
parent 9c1ac4e850
commit 856e1fe812
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/modules/module-client-node/client-node.c
View file

@ -660,7 +660,8 @@ static int do_port_set_io(struct impl *impl,
direction == SPA_DIRECTION_INPUT ? "input" : "output", direction == SPA_DIRECTION_INPUT ? "input" : "output",
port_id, mix_id, data, size); port_id, mix_id, data, size);
spa_return_val_if_fail(CHECK_PORT(this, direction, port_id), -EINVAL); if (!CHECK_PORT(this, direction, port_id))
return data == NULL ? 0 : -EINVAL;
port = GET_PORT(this, direction, port_id); port = GET_PORT(this, direction, port_id);

4
src/pipewire/private.h
View file

@ -624,7 +624,7 @@ struct pw_impl_port {
struct spa_hook global_listener; struct spa_hook global_listener;
#define PW_IMPL_PORT_FLAG_TO_REMOVE (1<<0) /**< if the port should be removed from the #define PW_IMPL_PORT_FLAG_TO_REMOVE (1<<0) /**< if the port should be removed from the
* implementation when destroyed */ * implementation when destroyed */
#define PW_IMPL_PORT_FLAG_BUFFERS (1<<1) /**< port has data */ #define PW_IMPL_PORT_FLAG_BUFFERS (1<<1) /**< port has data */
#define PW_IMPL_PORT_FLAG_CONTROL (1<<2) /**< port has control */ #define PW_IMPL_PORT_FLAG_CONTROL (1<<2) /**< port has control */
#define PW_IMPL_PORT_FLAG_NO_MIXER (1<<3) /**< don't try to add mixer to port */ #define PW_IMPL_PORT_FLAG_NO_MIXER (1<<3) /**< don't try to add mixer to port */
@ -653,7 +653,7 @@ struct pw_impl_port {
struct spa_callbacks impl; struct spa_callbacks impl;
struct spa_node *mix; /**< port buffer mix/split */ struct spa_node *mix; /**< port buffer mix/split */
#define PW_IMPL_PORT_MIX_FLAG_MULTI (1<<0) /**< multi input or output */ #define PW_IMPL_PORT_MIX_FLAG_MULTI (1<<0) /**< multi input or output */
#define PW_IMPL_PORT_MIX_FLAG_MIX_ONLY (1<<1) /**< only negotiate mix ports */ #define PW_IMPL_PORT_MIX_FLAG_MIX_ONLY (1<<1) /**< only negotiate mix ports */
#define PW_IMPL_PORT_MIX_FLAG_NEGOTIATE (1<<2) /**< negotiate buffers */ #define PW_IMPL_PORT_MIX_FLAG_NEGOTIATE (1<<2) /**< negotiate buffers */
uint32_t mix_flags; /**< flags for the mixing */ uint32_t mix_flags; /**< flags for the mixing */