mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: only emit register notify in pairs

Browse source 
Only emit Off when On was sent.
This commit is contained in:
Wim Taymans 2023-05-12 15:25:38 +02:00
parent 8b18cbdce1
commit b3eb4518cb
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,6 +166,7 @@ struct object {
struct pw_proxy *proxy; struct pw_proxy *proxy;
struct spa_hook proxy_listener; struct spa_hook proxy_listener;
struct spa_hook object_listener; struct spa_hook object_listener;
int registered;
unsigned int removing:1; unsigned int removing:1;
unsigned int removed:1; unsigned int removed:1;
}; };
@ -929,6 +930,8 @@ static void emit_callbacks(struct client *c)
switch (notify->type) { switch (notify->type) {
case NOTIFY_TYPE_REGISTRATION: case NOTIFY_TYPE_REGISTRATION:
if (o->registered == notify->arg1)
break;
pw_log_debug("%p: node %u %s %u", c, o->serial, pw_log_debug("%p: node %u %s %u", c, o->serial,
o->node.name, notify->arg1); o->node.name, notify->arg1);
do_callback(c, registration_callback, true, do_callback(c, registration_callback, true,
@ -937,6 +940,8 @@ static void emit_callbacks(struct client *c)
c->registration_arg); c->registration_arg);
break; break;
case NOTIFY_TYPE_PORTREGISTRATION: case NOTIFY_TYPE_PORTREGISTRATION:
if (o->registered == notify->arg1)
break;
pw_log_debug("%p: port %u %s %u", c, o->serial, pw_log_debug("%p: port %u %s %u", c, o->serial,
o->port.name, notify->arg1); o->port.name, notify->arg1);
do_callback(c, portregistration_callback, c->active, do_callback(c, portregistration_callback, c->active,
@ -945,6 +950,8 @@ static void emit_callbacks(struct client *c)
c->portregistration_arg); c->portregistration_arg);
break; break;
case NOTIFY_TYPE_CONNECT: case NOTIFY_TYPE_CONNECT:
if (o->registered == notify->arg1)
break;
pw_log_debug("%p: link %u %u -> %u %u", c, o->serial, pw_log_debug("%p: link %u %u -> %u %u", c, o->serial,
o->port_link.src_serial, o->port_link.src_serial,
o->port_link.dst, notify->arg1); o->port_link.dst, notify->arg1);
@ -997,9 +1004,12 @@ static void emit_callbacks(struct client *c)
default: default:
break; break;
} }
if (o != NULL && notify->arg1 == 0 && o->removing) { if (o != NULL) {
o->removing = false; o->registered = notify->arg1;
free_object(c, o); if (notify->arg1 == 0 && o->removing) {
o->removing = false;
free_object(c, o);
}
} }
avail -= sizeof(struct notify); avail -= sizeof(struct notify);
index += sizeof(struct notify); index += sizeof(struct notify);