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

control: undo done work in case of error

Browse source
This commit is contained in:
Wim Taymans 2018-03-16 16:53:57 +01:00
parent 3a9df8096b
commit e8d0281982
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/pipewire/control.c
View file

@ -54,7 +54,8 @@ pw_control_new(struct pw_core *core,
":", t->param.propId, "I", &this->prop_id) < 0) ":", t->param.propId, "I", &this->prop_id) < 0)
goto exit_free; goto exit_free;
pw_log_debug("control %p: new %s %d", this, spa_type_map_get_type(t->map, this->prop_id), direction); pw_log_debug("control %p: new %s %d", this,
spa_type_map_get_type(t->map, this->prop_id), direction);
this->core = core; this->core = core;
this->port = port; this->port = port;
@ -184,6 +185,12 @@ int pw_control_link(struct pw_control *control, struct pw_control *other)
port->direction, port->port_id, port->direction, port->port_id,
control->id, control->id,
impl->mem->ptr, control->size)) < 0) { impl->mem->ptr, control->size)) < 0) {
/* undo */
port = other->port;
spa_node_port_set_io(port->node->node,
port->direction, port->port_id,
other->id,
NULL, 0);
goto exit; goto exit;
} }
} }
@ -203,6 +210,8 @@ int pw_control_unlink(struct pw_control *control, struct pw_control *other)
{ {
int res = 0; int res = 0;
pw_log_debug("control %p: unlink from %p", control, other);
if (control->direction == SPA_DIRECTION_INPUT) { if (control->direction == SPA_DIRECTION_INPUT) {
struct pw_control *tmp = control; struct pw_control *tmp = control;
control = other; control = other;
@ -215,8 +224,6 @@ int pw_control_unlink(struct pw_control *control, struct pw_control *other)
if (other->output != control) if (other->output != control)
return -EINVAL; return -EINVAL;
pw_log_debug("control %p: unlink from %p", control, other);
other->output = NULL; other->output = NULL;
spa_list_remove(&other->inputs_link); spa_list_remove(&other->inputs_link);