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

pulse-server: keep metadata for the routes

Browse source 
Pass all metadata objects to the pulse-server and keep track of
some. Keep route restore info in properties.
This commit is contained in:
Wim Taymans 2020-11-23 10:44:12 +01:00
parent 1f73280c52
commit 4f0f5fccc9
3 changed files with 62 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/modules/module-protocol-pulse/manager.c
View file

@ -32,7 +32,7 @@
#define manager_emit_added(m,o) spa_hook_list_call(&m->hooks, struct pw_manager_events, added, 0, o)
#define manager_emit_updated(m,o) spa_hook_list_call(&m->hooks, struct pw_manager_events, updated, 0, o)
#define manager_emit_removed(m,o) spa_hook_list_call(&m->hooks, struct pw_manager_events, removed, 0, o)
#define manager_emit_metadata(m,s,k,t,v) spa_hook_list_call(&m->hooks, struct pw_manager_events, metadata,0,s,k,t,v)
#define manager_emit_metadata(m,o,s,k,t,v) spa_hook_list_call(&m->hooks, struct pw_manager_events, metadata,0,o,s,k,t,v)
struct object;
@ -43,8 +43,6 @@ struct manager {
struct spa_hook registry_listener;
int sync_seq;
struct object *metadata;
struct spa_hook_list hooks;
};
@ -412,8 +410,8 @@ static int metadata_property(void *object,
{
struct object *o = object;
struct manager *m = o->manager;
manager_emit_metadata(m, subject, key, type, value);
return 0;
manager_emit_metadata(m, &o->this, subject, key, type, value);
return 0;
}
static const struct pw_metadata_events metadata_events = {
@ -421,26 +419,10 @@ static const struct pw_metadata_events metadata_events = {
.property = metadata_property,
};
static void metadata_init(struct object *o)
{
struct manager *m = o->manager;
if (m->metadata == NULL)
m->metadata = o;
}
static void metadata_destroy(struct object *o)
{
struct manager *m = o->manager;
if (m->metadata == o)
m->metadata = NULL;
}
static const struct object_info metadata_info = {
.type = PW_TYPE_INTERFACE_Metadata,
.version = PW_VERSION_METADATA,
.events = &metadata_events,
.init = metadata_init,
.destroy = metadata_destroy,
};
static const struct object_info *objects[] =
@ -637,6 +619,7 @@ void pw_manager_add_listener(struct pw_manager *manager,
}
int pw_manager_set_metadata(struct pw_manager *manager,
struct pw_manager_object *metadata,
uint32_t subject, const char *key, const char *type,
const char *format, ...)
{
@ -650,16 +633,16 @@ int pw_manager_set_metadata(struct pw_manager *manager,
if (!SPA_FLAG_IS_SET(s->this.permissions, PW_PERM_M))
return -EACCES;
if (m->metadata == NULL)
if (metadata == NULL)
return -ENOTSUP;
if (!SPA_FLAG_IS_SET(m->metadata->this.permissions, PW_PERM_W|PW_PERM_X))
if (!SPA_FLAG_IS_SET(metadata->permissions, PW_PERM_W|PW_PERM_X))
return -EACCES;
va_start(args, format);
vsnprintf(buf, sizeof(buf)-1, format, args);
va_end(args);
pw_metadata_set_property(m->metadata->this.proxy,
pw_metadata_set_property(metadata->proxy,
subject, key, type, buf);
return 0;
}