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: don't update srate/bufsize when there is a callback

Browse source 
When we have a callback installed but the bufsize/srate can not be
notified yet because the client is inactive, try again in the next
cycle.

Fixes #3297
This commit is contained in:
Wim Taymans 2023-06-19 09:31:17 +02:00
parent 946457d555
commit 6fc9914431
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -926,7 +926,7 @@ static void emit_callbacks(struct client *c)
notify = SPA_PTROFF(c->notify_buffer, index & NOTIFY_BUFFER_MASK, struct notify); notify = SPA_PTROFF(c->notify_buffer, index & NOTIFY_BUFFER_MASK, struct notify);
o = notify->object; o = notify->object;
pw_log_debug("%p: dequeue notify index:%08x %p type:%d %p arg1:%d\n", c, pw_log_debug("%p: dequeue notify index:%08x %p type:%d %p arg1:%d", c,
index, notify, notify->type, o, notify->arg1); index, notify, notify->type, o, notify->arg1);
switch (notify->type) { switch (notify->type) {
@ -1025,7 +1025,7 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
int32_t filled; int32_t filled;
uint32_t index; uint32_t index;
struct notify *notify; struct notify *notify;
bool emit = false;; bool emit = false;
switch (type) { switch (type) {
case NOTIFY_TYPE_REGISTRATION: case NOTIFY_TYPE_REGISTRATION:
@ -1058,18 +1058,19 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
default: default:
break; break;
} }
if ((type & NOTIFY_ACTIVE_FLAG) && !c->active) if (!emit || ((type & NOTIFY_ACTIVE_FLAG) && !c->active)) {
emit = false;
if (!emit) {
switch (type) { switch (type) {
case NOTIFY_TYPE_BUFFER_FRAMES: case NOTIFY_TYPE_BUFFER_FRAMES:
c->buffer_frames = arg1; if (!emit)
c->buffer_frames = arg1;
break; break;
case NOTIFY_TYPE_SAMPLE_RATE: case NOTIFY_TYPE_SAMPLE_RATE:
c->sample_rate = arg1; if (!emit)
c->sample_rate = arg1;
break; break;
} }
pw_log_debug("%p: skip notify %08x active:%d", c, type, c->active); pw_log_debug("%p: skip notify %08x active:%d emit:%d", c, type,
c->active, emit);
if (o != NULL && arg1 == 0 && o->removing) { if (o != NULL && arg1 == 0 && o->removing) {
o->removing = false; o->removing = false;
free_object(c, o); free_object(c, o);
@ -1088,7 +1089,7 @@ static int queue_notify(struct client *c, int type, struct object *o, int arg1,
notify->object = o; notify->object = o;
notify->arg1 = arg1; notify->arg1 = arg1;
notify->msg = msg; notify->msg = msg;
pw_log_debug("%p: queue notify index:%08x %p type:%d %p arg1:%d msg:%s\n", c, pw_log_debug("%p: queue notify index:%08x %p type:%d %p arg1:%d msg:%s", c,
index, notify, notify->type, o, notify->arg1, notify->msg); index, notify, notify->type, o, notify->arg1, notify->msg);
index += sizeof(struct notify); index += sizeof(struct notify);
spa_ringbuffer_write_update(&c->notify_ring, index); spa_ringbuffer_write_update(&c->notify_ring, index);