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

link-factory: allow usage without a client

Browse source 
So that it can be used in the config files.

Fixes #2095
This commit is contained in:
Wim Taymans 2022-02-02 21:34:23 +01:00
parent 1a911a9ccd
commit 92e58eeb4f
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/module-link-factory.c
View file

@ -57,6 +57,7 @@ static const struct spa_dict_item module_props[] = {
struct factory_data { struct factory_data {
struct pw_impl_module *module; struct pw_impl_module *module;
struct pw_context *context;
struct pw_impl_factory *this; struct pw_impl_factory *this;
struct spa_list link_list; struct spa_list link_list;
@ -125,9 +126,13 @@ static void link_destroy(void *data)
static void link_initialized(void *data) static void link_initialized(void *data)
{ {
struct link_data *ld = data; struct link_data *ld = data;
struct pw_impl_client *client = pw_resource_get_client(ld->factory_resource); struct pw_impl_client *client;
int res; int res;
if (ld->factory_resource == NULL)
return;
client = pw_resource_get_client(ld->factory_resource);
ld->global = pw_impl_link_get_global(ld->link); ld->global = pw_impl_link_get_global(ld->link);
pw_global_add_listener(ld->global, &ld->global_listener, &global_events, ld); pw_global_add_listener(ld->global, &ld->global_listener, &global_events, ld);
@ -364,7 +369,7 @@ static void *create_object(void *_data,
struct pw_impl_client *client = NULL; struct pw_impl_client *client = NULL;
struct pw_impl_node *output_node, *input_node; struct pw_impl_node *output_node, *input_node;
struct pw_impl_port *outport = NULL, *inport = NULL; struct pw_impl_port *outport = NULL, *inport = NULL;
struct pw_context *context; struct pw_context *context = d->context;
struct pw_impl_link *link; struct pw_impl_link *link;
const char *output_node_str, *input_node_str; const char *output_node_str, *input_node_str;
const char *output_port_str, *input_port_str; const char *output_port_str, *input_port_str;
@ -372,9 +377,6 @@ static void *create_object(void *_data,
int res; int res;
bool linger; bool linger;
client = pw_resource_get_client(resource);
context = pw_impl_client_get_context(client);
if (properties == NULL) if (properties == NULL)
goto error_properties; goto error_properties;
@ -406,7 +408,9 @@ static void *create_object(void *_data,
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d", pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_impl_factory_get_info(d->this)->id); pw_impl_factory_get_info(d->this)->id);
if (!linger)
client = resource ? pw_resource_get_client(resource) : NULL;
if (client && !linger)
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d", pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_impl_client_get_info(client)->id); pw_impl_client_get_info(client)->id);
@ -524,6 +528,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
data = pw_impl_factory_get_user_data(factory); data = pw_impl_factory_get_user_data(factory);
data->this = factory; data->this = factory;
data->module = module; data->module = module;
data->context = context;
data->work = pw_context_get_work_queue(context); data->work = pw_context_get_work_queue(context);
if (data->work == NULL) { if (data->work == NULL) {
res = -errno; res = -errno;