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

pulse-server: use key instead of id for the data key

Browse source
This commit is contained in:
Wim Taymans 2022-01-17 10:03:02 +01:00
parent b2d221a66c
commit 3b85369ff6
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ struct object_info {
struct object_data { struct object_data {
struct spa_list link; struct spa_list link;
const char *id; const char *key;
size_t size; size_t size;
}; };
@ -820,22 +820,22 @@ void pw_manager_destroy(struct pw_manager *manager)
free(m); free(m);
} }
static struct object_data *object_find_data(struct object *o, const char *id) static struct object_data *object_find_data(struct object *o, const char *key)
{ {
struct object_data *d; struct object_data *d;
spa_list_for_each(d, &o->data_list, link) { spa_list_for_each(d, &o->data_list, link) {
if (spa_streq(d->id, id)) if (spa_streq(d->key, key))
return d; return d;
} }
return NULL; return NULL;
} }
void *pw_manager_object_add_data(struct pw_manager_object *obj, const char *id, size_t size) void *pw_manager_object_add_data(struct pw_manager_object *obj, const char *key, size_t size)
{ {
struct object *o = SPA_CONTAINER_OF(obj, struct object, this); struct object *o = SPA_CONTAINER_OF(obj, struct object, this);
struct object_data *d; struct object_data *d;
d = object_find_data(o, id); d = object_find_data(o, key);
if (d != NULL) { if (d != NULL) {
if (d->size == size) if (d->size == size)
goto done; goto done;
@ -844,7 +844,7 @@ void *pw_manager_object_add_data(struct pw_manager_object *obj, const char *id,
} }
d = calloc(1, sizeof(struct object_data) + size); d = calloc(1, sizeof(struct object_data) + size);
d->id = id; d->key = key;
d->size = size; d->size = size;
spa_list_append(&o->data_list, &d->link); spa_list_append(&o->data_list, &d->link);

4
src/modules/module-protocol-pulse/manager.h
View file

@ -111,8 +111,8 @@ int pw_manager_for_each_object(struct pw_manager *manager,
int (*callback) (void *data, struct pw_manager_object *object), int (*callback) (void *data, struct pw_manager_object *object),
void *data); void *data);
void *pw_manager_object_add_data(struct pw_manager_object *o, const char *id, size_t size); void *pw_manager_object_add_data(struct pw_manager_object *o, const char *key, size_t size);
void *pw_manager_object_get_data(struct pw_manager_object *obj, const char *id); void *pw_manager_object_get_data(struct pw_manager_object *obj, const char *key);
bool pw_manager_object_is_client(struct pw_manager_object *o); bool pw_manager_object_is_client(struct pw_manager_object *o);
bool pw_manager_object_is_module(struct pw_manager_object *o); bool pw_manager_object_is_module(struct pw_manager_object *o);