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

jack: emit more graph_order callbacks

Browse source 
We should actually emit the graphorder callback whenever something
changed, also when a client or port was added/removed.

Also emit the graphorder callback right after a client is activated to
make jackdbus work.
This commit is contained in:
Wim Taymans 2021-07-20 11:44:35 +02:00
parent cb3543e9b4
commit cea8a95a59
1 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pipewire-jack/src/pipewire-jack.c
View file

@ -2444,7 +2444,7 @@ static void registry_event_global(void *data, uint32_t id,
struct object *o, *ot, *op; struct object *o, *ot, *op;
const char *str; const char *str;
size_t size; size_t size;
bool is_first = false; bool is_first = false, graph_changed = false;
if (props == NULL) if (props == NULL)
return; return;
@ -2701,6 +2701,7 @@ static void registry_event_global(void *data, uint32_t id,
pw_log_info(NAME" %p: client added \"%s\"", c, o->node.name); pw_log_info(NAME" %p: client added \"%s\"", c, o->node.name);
do_callback(c, registration_callback, do_callback(c, registration_callback,
o->node.name, 1, c->registration_arg); o->node.name, 1, c->registration_arg);
graph_changed = true;
} }
break; break;
@ -2708,14 +2709,17 @@ static void registry_event_global(void *data, uint32_t id,
pw_log_info(NAME" %p: port added %d \"%s\"", c, o->id, o->port.name); pw_log_info(NAME" %p: port added %d \"%s\"", c, o->id, o->port.name);
do_callback(c, portregistration_callback, do_callback(c, portregistration_callback,
o->id, 1, c->portregistration_arg); o->id, 1, c->portregistration_arg);
graph_changed = true;
break; break;
case INTERFACE_Link: case INTERFACE_Link:
do_callback(c, connect_callback, do_callback(c, connect_callback,
o->port_link.src, o->port_link.dst, 1, c->connect_arg); o->port_link.src, o->port_link.dst, 1, c->connect_arg);
do_callback(c, graph_callback, c->graph_arg); graph_changed = true;
break; break;
} }
if (graph_changed)
do_callback(c, graph_callback, c->graph_arg);
exit: exit:
return; return;
@ -2728,6 +2732,7 @@ static void registry_event_global_remove(void *object, uint32_t id)
{ {
struct client *c = (struct client *) object; struct client *c = (struct client *) object;
struct object *o; struct object *o;
bool graph_changed = false;
pw_log_debug(NAME" %p: removed: %u", c, id); pw_log_debug(NAME" %p: removed: %u", c, id);
@ -2751,12 +2756,14 @@ static void registry_event_global_remove(void *object, uint32_t id)
pw_log_info(NAME" %p: client %u removed \"%s\"", c, o->id, o->node.name); pw_log_info(NAME" %p: client %u removed \"%s\"", c, o->id, o->node.name);
do_callback(c, registration_callback, do_callback(c, registration_callback,
o->node.name, 0, c->registration_arg); o->node.name, 0, c->registration_arg);
graph_changed = true;
} }
break; break;
case INTERFACE_Port: case INTERFACE_Port:
pw_log_info(NAME" %p: port %u removed \"%s\"", c, o->id, o->port.name); pw_log_info(NAME" %p: port %u removed \"%s\"", c, o->id, o->port.name);
do_callback(c, portregistration_callback, do_callback(c, portregistration_callback,
o->id, 0, c->portregistration_arg); o->id, 0, c->portregistration_arg);
graph_changed = true;
break; break;
case INTERFACE_Link: case INTERFACE_Link:
if (find_type(c, o->port_link.src, INTERFACE_Port) != NULL && if (find_type(c, o->port_link.src, INTERFACE_Port) != NULL &&
@ -2765,12 +2772,14 @@ static void registry_event_global_remove(void *object, uint32_t id)
o->port_link.src, o->port_link.dst); o->port_link.src, o->port_link.dst);
do_callback(c, connect_callback, do_callback(c, connect_callback,
o->port_link.src, o->port_link.dst, 0, c->connect_arg); o->port_link.src, o->port_link.dst, 0, c->connect_arg);
do_callback(c, graph_callback, c->graph_arg); graph_changed = true;
} else } else
pw_log_warn("unlink between unknown ports %d and %d", pw_log_warn("unlink between unknown ports %d and %d",
o->port_link.src, o->port_link.dst); o->port_link.src, o->port_link.dst);
break; break;
} }
if (graph_changed)
do_callback(c, graph_callback, c->graph_arg);
/* JACK clients expect the objects to hang around after /* JACK clients expect the objects to hang around after
* they are unregistered. We keep the memory around for that * they are unregistered. We keep the memory around for that
@ -3210,6 +3219,8 @@ int jack_activate (jack_client_t *client)
if (c->position) if (c->position)
check_buffer_frames(c, c->position); check_buffer_frames(c, c->position);
do_callback(c, graph_callback, c->graph_arg);
done: done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
@ -3548,7 +3559,7 @@ int jack_set_graph_order_callback (jack_client_t *client,
pw_log_error(NAME" %p: can't set callback on active client", c); pw_log_error(NAME" %p: can't set callback on active client", c);
return -EIO; return -EIO;
} }
pw_log_trace(NAME" %p: %p %p", c, graph_callback, data); pw_log_debug(NAME" %p: %p %p", c, graph_callback, data);
c->graph_callback = graph_callback; c->graph_callback = graph_callback;
c->graph_arg = data; c->graph_arg = data;
return 0; return 0;