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

impl-device: add device.object.properties

Browse source 
Instead of copying all the device properties to the child object,
only copy the ones in device.object.properties and add the
ones from the object info.

Clean up the object handles when something goes wrong.
This commit is contained in:
Wim Taymans 2024-02-13 11:37:21 +01:00
parent ee5e1a92be
commit c08c335264
1 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
src/pipewire/impl-device.c
View file

@ -11,6 +11,7 @@
#include <spa/utils/string.h> #include <spa/utils/string.h>
#include "pipewire/impl.h" #include "pipewire/impl.h"
#include "pipewire/cleanup.h"
#include "pipewire/private.h" #include "pipewire/private.h"
PW_LOG_TOPIC_EXTERN(log_device); PW_LOG_TOPIC_EXTERN(log_device);
@ -765,7 +766,7 @@ static void device_add_object(struct pw_impl_device *device, uint32_t id,
{ {
struct pw_context *context = device->context; struct pw_context *context = device->context;
struct spa_handle *handle; struct spa_handle *handle;
struct pw_properties *props; spa_autoptr(pw_properties) props = NULL;
int res; int res;
void *iface; void *iface;
struct object_data *od = NULL; struct object_data *od = NULL;
@ -775,26 +776,35 @@ static void device_add_object(struct pw_impl_device *device, uint32_t id,
return; return;
} }
handle = pw_context_load_spa_handle(context, info->factory_name, info->props); props = pw_properties_new(NULL, NULL);
if (props == NULL) {
pw_log_warn("%p: allocation error: %m", device);
return;
}
if (info->props)
pw_properties_update(props, info->props);
if ((str = pw_properties_get(device->properties, "device.object.properties")))
pw_properties_update_string(props, str, strlen(str));
handle = pw_context_load_spa_handle(context, info->factory_name, &props->dict);
if (handle == NULL) { if (handle == NULL) {
pw_log_warn("%p: can't load handle %s: %m", pw_log_warn("%p: can't load handle %s: %m",
device, info->factory_name); device, info->factory_name);
return; goto cleanup;
} }
if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) { if ((res = spa_handle_get_interface(handle, info->type, &iface)) < 0) {
pw_log_error("%p: can't get %s interface: %s", device, info->type, pw_log_error("%p: can't get %s interface: %s", device, info->type,
spa_strerror(res)); spa_strerror(res));
return; goto cleanup;
} }
props = pw_properties_copy(device->properties);
if (info->props && props)
pw_properties_update(props, info->props);
if (spa_streq(info->type, SPA_TYPE_INTERFACE_Node)) { if (spa_streq(info->type, SPA_TYPE_INTERFACE_Node)) {
struct pw_impl_node *node; struct pw_impl_node *node;
node = pw_context_create_node(context, props, sizeof(struct object_data)); node = pw_context_create_node(context, spa_steal_ptr(props),
sizeof(struct object_data));
if (node == NULL)
goto cleanup;
od = pw_impl_node_get_user_data(node); od = pw_impl_node_get_user_data(node);
od->object = node; od->object = node;
@ -803,7 +813,10 @@ static void device_add_object(struct pw_impl_device *device, uint32_t id,
pw_impl_node_set_implementation(node, iface); pw_impl_node_set_implementation(node, iface);
} else if (spa_streq(info->type, SPA_TYPE_INTERFACE_Device)) { } else if (spa_streq(info->type, SPA_TYPE_INTERFACE_Device)) {
struct pw_impl_device *dev; struct pw_impl_device *dev;
dev = pw_context_create_device(context, props, sizeof(struct object_data)); dev = pw_context_create_device(context, spa_steal_ptr(props),
sizeof(struct object_data));
if (dev == NULL)
goto cleanup;
od = pw_impl_device_get_user_data(dev); od = pw_impl_device_get_user_data(dev);
od->object = dev; od->object = dev;
@ -812,9 +825,8 @@ static void device_add_object(struct pw_impl_device *device, uint32_t id,
pw_impl_device_set_implementation(dev, iface); pw_impl_device_set_implementation(dev, iface);
} else { } else {
pw_log_warn("%p: unknown type %s", device, info->type); pw_log_warn("%p: unknown type %s", device, info->type);
pw_properties_free(props); goto cleanup;
} }
if (od) { if (od) {
od->id = id; od->id = id;
od->handle = handle; od->handle = handle;
@ -823,6 +835,11 @@ static void device_add_object(struct pw_impl_device *device, uint32_t id,
object_register(od, device->info.id); object_register(od, device->info.id);
} }
return; return;
cleanup:
if (handle)
pw_unload_spa_handle(handle);
return;
} }
static struct object_data *find_object(struct pw_impl_device *device, uint32_t id) static struct object_data *find_object(struct pw_impl_device *device, uint32_t id)