mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-16 08:56:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

jack: sync after setting metadata

Browse source 
Do a do_sync after setting the metadata to ensure the messages are
flushed to the server and processed. Fixes an issue where jack_property
would exit before the messages are flushed and so nothing happens.
This commit is contained in:
Wim Taymans 2023-09-19 12:43:40 +02:00
parent ee1bb2362d
commit 4568d90565
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pipewire-jack/src/metadata.c
View file

@ -230,7 +230,7 @@ int jack_set_property(jack_client_t*client,
pw_log_info("set id:%u (%"PRIu64") '%s' to '%s@%s'", o->id, subject, key, value, type); pw_log_info("set id:%u (%"PRIu64") '%s' to '%s@%s'", o->id, subject, key, value, type);
if (update_property(c, subject, key, type, value)) if (update_property(c, subject, key, type, value))
pw_metadata_set_property(c->metadata->proxy, o->id, key, type, value); pw_metadata_set_property(c->metadata->proxy, o->id, key, type, value);
res = 0; res = do_sync(c);
done: done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
@ -340,7 +340,7 @@ int jack_remove_property (jack_client_t* client, jack_uuid_t subject, const char
pw_log_info("remove id:%u (%"PRIu64") '%s'", id, subject, key); pw_log_info("remove id:%u (%"PRIu64") '%s'", id, subject, key);
pw_metadata_set_property(c->metadata->proxy, pw_metadata_set_property(c->metadata->proxy,
id, key, NULL, NULL); id, key, NULL, NULL);
res = 0; res = do_sync(c);
done: done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
@ -365,7 +365,7 @@ int jack_remove_properties (jack_client_t* client, jack_uuid_t subject)
pw_log_info("remove id:%u (%"PRIu64")", id, subject); pw_log_info("remove id:%u (%"PRIu64")", id, subject);
pw_metadata_set_property(c->metadata->proxy, pw_metadata_set_property(c->metadata->proxy,
id, NULL, NULL, NULL); id, NULL, NULL, NULL);
res = 0; res = do_sync(c);
done: done:
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
@ -375,15 +375,17 @@ done:
SPA_EXPORT SPA_EXPORT
int jack_remove_all_properties (jack_client_t* client) int jack_remove_all_properties (jack_client_t* client)
{ {
int res;
struct client *c = (struct client *) client; struct client *c = (struct client *) client;
spa_return_val_if_fail(c != NULL, -EINVAL); spa_return_val_if_fail(c != NULL, -EINVAL);
pw_thread_loop_lock(c->context.loop); pw_thread_loop_lock(c->context.loop);
pw_metadata_clear(c->metadata->proxy); pw_metadata_clear(c->metadata->proxy);
res = do_sync(c);
pw_thread_loop_unlock(c->context.loop); pw_thread_loop_unlock(c->context.loop);
return 0; return res;
} }
SPA_EXPORT SPA_EXPORT