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

impl-node: handle error from the Start command

Browse source 
When we execute Start on a node, handle the error case and set
the node into the error state.
This commit is contained in:
Wim Taymans 2021-03-23 17:25:36 +01:00
parent a9e14a30da
commit fe49c2e6b1
1 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/pipewire/impl-node.c
View file

@ -317,6 +317,23 @@ static void node_update_state(struct pw_impl_node *node, enum pw_node_state stat
struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this); struct impl *impl = SPA_CONTAINER_OF(node, struct impl, this);
enum pw_node_state old = node->info.state; enum pw_node_state old = node->info.state;
switch (state) {
case PW_NODE_STATE_RUNNING:
if (node->driving && node->driver) {
res = spa_node_send_command(node->node,
&SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_Start));
if (res < 0) {
state = PW_NODE_STATE_ERROR;
error = spa_aprintf("Start error: %s", spa_strerror(res));
}
}
if (res >= 0)
pw_loop_invoke(node->data_loop, do_node_add, 1, NULL, 0, true, node);
break;
default:
break;
}
free((char*)node->info.error); free((char*)node->info.error);
node->info.error = error; node->info.error = error;
node->info.state = state; node->info.state = state;
@ -335,19 +352,6 @@ static void node_update_state(struct pw_impl_node *node, enum pw_node_state stat
pw_log_info("(%s-%u) %s -> %s", node->name, node->info.id, pw_log_info("(%s-%u) %s -> %s", node->name, node->info.id,
pw_node_state_as_string(old), pw_node_state_as_string(state)); pw_node_state_as_string(old), pw_node_state_as_string(state));
} }
switch (state) {
case PW_NODE_STATE_RUNNING:
if (node->driving && node->driver)
spa_node_send_command(node->node,
&SPA_NODE_COMMAND_INIT(SPA_NODE_COMMAND_Start));
pw_loop_invoke(node->data_loop, do_node_add, 1, NULL, 0, true, node);
break;
default:
break;
}
pw_impl_node_emit_state_changed(node, old, state, error); pw_impl_node_emit_state_changed(node, old, state, error);
node->info.change_mask |= PW_NODE_CHANGE_MASK_STATE; node->info.change_mask |= PW_NODE_CHANGE_MASK_STATE;