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

node_factory -> factory

Browse source 
Rename the node-factory to a more generic object factory.
Add type and version to create objects from a factory
Start on factory introspection
This commit is contained in:
Wim Taymans 2017-09-17 16:47:03 +02:00
parent 3c1957fd9d
commit 7f20e04803
24 changed files with 472 additions and 325 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/module-flatpak.c
View file

@ -77,7 +77,6 @@ struct async_pending {
bool handled;
char *handle;
char *factory_name;
char *name;
uint32_t type;
uint32_t version;
struct pw_properties *properties;
@ -135,7 +134,6 @@ static void free_pending(struct async_pending *p)
spa_list_remove(&p->link);
free(p->handle);
free(p->factory_name);
free(p->name);
if (p->properties)
pw_properties_free(p->properties);
free(p);
@ -305,9 +303,8 @@ portal_response(DBusConnection *connection, DBusMessage *msg, void *user_data)
pw_resource_do_parent(p->resource->resource,
&p->resource->override,
struct pw_core_proxy_methods,
create_node,
create_object,
p->factory_name,
p->name,
p->type,
p->version,
&p->properties->dict,
@ -325,13 +322,12 @@ portal_response(DBusConnection *connection, DBusMessage *msg, void *user_data)
}
static void do_create_node(void *data,
const char *factory_name,
const char *name,
uint32_t type,
uint32_t version,
const struct spa_dict *props,
uint32_t new_id)
static void do_create_object(void *data,
const char *factory_name,
uint32_t type,
uint32_t version,
const struct spa_dict *props,
uint32_t new_id)
{
struct resource *resource = data;
struct client_info *cinfo = resource->cinfo;
@ -350,9 +346,8 @@ static void do_create_node(void *data,
pw_resource_do_parent(resource->resource,
&resource->override,
struct pw_core_proxy_methods,
create_node,
create_object,
factory_name,
name,
type,
version,
props,
@ -411,7 +406,6 @@ static void do_create_node(void *data,
p->handle = strdup(handle);
p->handled = false;
p->factory_name = strdup(factory_name);
p->name = strdup(name);
p->type = type;
p->version = version;
p->properties = props ? pw_properties_new_dict(props) : NULL;
@ -479,7 +473,7 @@ do_create_link(void *data,
static const struct pw_core_proxy_methods core_override = {
PW_VERSION_CORE_PROXY_METHODS,
.create_node = do_create_node,
.create_object = do_create_object,
.create_link = do_create_link,
};