mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-22 08:56:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pw_factory -> pw_impl_factory

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 11:45:27 +01:00
parent 73900eea1b
commit 815d4a8d20
17 changed files with 170 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/modules/module-adapter.c
View file

@ -51,7 +51,7 @@ static const struct spa_dict_item module_props[] = {
};
struct factory_data {
struct pw_factory *this;
struct pw_impl_factory *this;
struct spa_list node_list;
@ -238,8 +238,8 @@ error_cleanup:
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -253,23 +253,23 @@ static void module_destroy(void *data)
spa_list_for_each_safe(nd, t, &d->node_list, link)
pw_node_destroy(nd->adapter);
pw_factory_destroy(d->this);
pw_impl_factory_destroy(d->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", module->global->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -284,10 +284,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"adapter",
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
@ -298,7 +298,7 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->context = context;
data->module = module;
@ -306,7 +306,7 @@ int pipewire__module_init(struct pw_module *module, const char *args)
pw_log_debug("module %p: new", module);
pw_factory_set_implementation(factory,
pw_impl_factory_set_implementation(factory,
&impl_factory,
data);

26
src/modules/module-client-device.c
View file

@ -50,7 +50,7 @@ struct pw_proxy *pw_core_spa_device_export(struct pw_core *core,
struct pw_protocol *pw_protocol_native_ext_client_device_init(struct pw_context *context);
struct factory_data {
struct pw_factory *this;
struct pw_impl_factory *this;
struct pw_module *module;
struct spa_hook module_listener;
@ -66,7 +66,7 @@ static void *create_object(void *_data,
uint32_t new_id)
{
struct factory_data *data = _data;
struct pw_factory *this = data->this;
struct pw_impl_factory *this = data->this;
void *result;
struct pw_resource *device_resource;
struct pw_impl_client *client = pw_resource_get_client(resource);
@ -86,7 +86,7 @@ static void *create_object(void *_data,
}
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_global_get_id(pw_factory_get_global(this)));
pw_global_get_id(pw_impl_factory_get_global(this)));
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
pw_global_get_id(pw_impl_client_get_global(client)));
@ -117,8 +117,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -130,23 +130,23 @@ static void module_destroy(void *data)
spa_list_remove(&d->export_spadevice.link);
pw_factory_destroy(d->this);
pw_impl_factory_destroy(d->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -161,10 +161,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"client-device",
SPA_TYPE_INTERFACE_Device,
SPA_VERSION_DEVICE,
@ -175,13 +175,13 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->module = module;
pw_log_debug("module %p: new", module);
pw_factory_set_implementation(factory,
pw_impl_factory_set_implementation(factory,
&impl_factory,
data);

22
src/modules/module-client-node.c
View file

@ -53,7 +53,7 @@ struct pw_protocol *pw_protocol_native_ext_client_node_init(struct pw_context *c
struct pw_protocol *pw_protocol_native_ext_client_node0_init(struct pw_context *context);
struct factory_data {
struct pw_factory *this;
struct pw_impl_factory *this;
struct pw_module *module;
struct spa_hook module_listener;
@ -107,8 +107,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -121,23 +121,23 @@ static void module_destroy(void *data)
spa_list_remove(&d->export_node.link);
spa_list_remove(&d->export_spanode.link);
pw_factory_destroy(d->this);
pw_impl_factory_destroy(d->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -152,10 +152,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"client-node",
PW_TYPE_INTERFACE_ClientNode,
PW_VERSION_CLIENT_NODE,
@ -164,13 +164,13 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->module = module;
pw_log_debug("module %p: new", module);
pw_factory_set_implementation(factory,
pw_impl_factory_set_implementation(factory,
&impl_factory,
data);

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

@ -49,7 +49,7 @@ static const struct spa_dict_item module_props[] = {
struct factory_data {
struct pw_module *module;
struct pw_factory *this;
struct pw_impl_factory *this;
struct spa_list link_list;
@ -319,8 +319,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -334,23 +334,23 @@ static void module_destroy(void *data)
spa_list_for_each_safe(ld, t, &d->link_list, l)
pw_link_destroy(ld->link);
pw_factory_destroy(d->this);
pw_impl_factory_destroy(d->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -365,10 +365,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"link-factory",
PW_TYPE_INTERFACE_Link,
PW_VERSION_LINK_PROXY,
@ -379,14 +379,14 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->module = module;
spa_list_init(&data->link_list);
pw_log_debug("module %p: new", module);
pw_factory_set_implementation(factory,
pw_impl_factory_set_implementation(factory,
&impl_factory,
data);

22
src/modules/module-metadata.c
View file

@ -52,7 +52,7 @@ struct pw_proxy *pw_core_metadata_export(struct pw_core *core,
int pw_protocol_native_ext_metadata_init(struct pw_context *context);
struct factory_data {
struct pw_factory *this;
struct pw_impl_factory *this;
struct pw_module *module;
struct spa_hook module_listener;
@ -103,8 +103,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -116,23 +116,23 @@ static void module_destroy(void *data)
spa_list_remove(&d->export_metadata.link);
pw_factory_destroy(d->this);
pw_impl_factory_destroy(d->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -147,14 +147,14 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
int res;
if ((res = pw_protocol_native_ext_metadata_init(context)) < 0)
return res;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"metadata",
PW_TYPE_INTERFACE_Metadata,
PW_VERSION_METADATA,
@ -163,13 +163,13 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->module = module;
pw_log_debug("module %p: new", module);
pw_factory_set_implementation(factory,
pw_impl_factory_set_implementation(factory,
&impl_factory,
data);

24
src/modules/module-session-manager/client-endpoint.c
View file

@ -38,7 +38,7 @@
#define NAME "client-endpoint"
struct factory_data {
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct pw_module *module;
struct spa_hook module_listener;
};
@ -166,7 +166,7 @@ static void *create_object(void *data,
uint32_t new_id)
{
struct factory_data *d = data;
struct pw_factory *factory = d->factory;
struct pw_impl_factory *factory = d->factory;
struct client_endpoint *this;
struct pw_impl_client *owner = pw_resource_get_client(owner_resource);
struct pw_context *context = pw_impl_client_get_context(owner);
@ -213,8 +213,8 @@ static void *create_object(void *data,
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -223,23 +223,23 @@ static void module_destroy(void *data)
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
pw_factory_destroy(d->factory);
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->factory;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", module->global->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -253,10 +253,10 @@ static const struct pw_module_events module_events = {
int client_endpoint_factory_init(struct pw_module *module)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"client-endpoint",
PW_TYPE_INTERFACE_ClientEndpoint,
PW_VERSION_CLIENT_ENDPOINT_PROXY,
@ -265,11 +265,11 @@ int client_endpoint_factory_init(struct pw_module *module)
if (factory == NULL)
return -ENOMEM;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->factory = factory;
data->module = module;
pw_factory_set_implementation(factory, &impl_factory, data);
pw_impl_factory_set_implementation(factory, &impl_factory, data);
pw_module_add_listener(module, &data->module_listener, &module_events, data);

24
src/modules/module-session-manager/client-session.c
View file

@ -38,7 +38,7 @@
#define NAME "client-session"
struct factory_data {
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct pw_module *module;
struct spa_hook module_listener;
};
@ -165,7 +165,7 @@ static void *create_object(void *data,
uint32_t new_id)
{
struct factory_data *d = data;
struct pw_factory *factory = d->factory;
struct pw_impl_factory *factory = d->factory;
struct client_session *this;
struct pw_impl_client *owner = pw_resource_get_client(owner_resource);
struct pw_context *context = pw_impl_client_get_context(owner);
@ -212,8 +212,8 @@ static void *create_object(void *data,
return NULL;
}
static const struct pw_factory_implementation impl_factory = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation impl_factory = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -222,23 +222,23 @@ static void module_destroy(void *data)
struct factory_data *d = data;
spa_hook_remove(&d->module_listener);
pw_factory_destroy(d->factory);
pw_impl_factory_destroy(d->factory);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->factory;
struct pw_impl_factory *factory = d->factory;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", module->global->id);
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -252,10 +252,10 @@ static const struct pw_module_events module_events = {
int client_session_factory_init(struct pw_module *module)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"client-session",
PW_TYPE_INTERFACE_ClientSession,
PW_VERSION_CLIENT_SESSION_PROXY,
@ -264,11 +264,11 @@ int client_session_factory_init(struct pw_module *module)
if (factory == NULL)
return -ENOMEM;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->factory = factory;
data->module = module;
pw_factory_set_implementation(factory, &impl_factory, data);
pw_impl_factory_set_implementation(factory, &impl_factory, data);
pw_module_add_listener(module, &data->module_listener, &module_events, data);

30
src/modules/spa/module-device-factory.c
View file

@ -49,7 +49,7 @@ static const struct spa_dict_item module_props[] = {
struct factory_data {
struct pw_context *context;
struct pw_module *module;
struct pw_factory *this;
struct pw_impl_factory *this;
struct spa_hook factory_listener;
struct spa_hook module_listener;
@ -98,7 +98,7 @@ static void *create_object(void *_data,
goto error_properties;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_global_get_id(pw_factory_get_global(data->this)));
pw_global_get_id(pw_impl_factory_get_global(data->this)));
client = resource ? pw_resource_get_client(resource) : NULL;
@ -147,8 +147,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation factory_impl = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation factory_impl = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -163,31 +163,31 @@ static void factory_destroy(void *_data)
pw_impl_device_destroy(nd->device);
}
static const struct pw_factory_events factory_events = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *_data)
{
struct factory_data *data = _data;
pw_factory_destroy(data->this);
pw_impl_factory_destroy(data->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -202,10 +202,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"spa-device-factory",
PW_TYPE_INTERFACE_Device,
PW_VERSION_DEVICE_PROXY,
@ -214,14 +214,14 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->module = module;
data->context = context;
spa_list_init(&data->device_list);
pw_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_factory_set_implementation(factory, &factory_impl, data);
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_factory_set_implementation(factory, &factory_impl, data);
pw_log_debug("module %p: new", module);
pw_module_update_properties(module, &SPA_DICT_INIT_ARRAY(module_props));

30
src/modules/spa/module-node-factory.c
View file

@ -48,7 +48,7 @@ static const struct spa_dict_item module_props[] = {
struct factory_data {
struct pw_context *context;
struct pw_factory *this;
struct pw_impl_factory *this;
struct pw_module *module;
struct spa_hook factory_listener;
@ -118,7 +118,7 @@ static void *create_object(void *_data,
client = resource ? pw_resource_get_client(resource) : NULL;
pw_properties_setf(properties, PW_KEY_FACTORY_ID, "%d",
pw_global_get_id(pw_factory_get_global(data->this)));
pw_global_get_id(pw_impl_factory_get_global(data->this)));
if (client) {
pw_properties_setf(properties, PW_KEY_CLIENT_ID, "%d",
@ -181,8 +181,8 @@ error_exit:
return NULL;
}
static const struct pw_factory_implementation factory_impl = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_implementation factory_impl = {
PW_VERSION_IMPL_FACTORY_IMPLEMENTATION,
.create_object = create_object,
};
@ -197,31 +197,31 @@ static void factory_destroy(void *_data)
pw_node_destroy(nd->node);
}
static const struct pw_factory_events factory_events = {
PW_VERSION_FACTORY_IMPLEMENTATION,
static const struct pw_impl_factory_events factory_events = {
PW_VERSION_IMPL_FACTORY_EVENTS,
.destroy = factory_destroy,
};
static void module_destroy(void *_data)
{
struct factory_data *data = _data;
pw_factory_destroy(data->this);
pw_impl_factory_destroy(data->this);
}
static void module_registered(void *data)
{
struct factory_data *d = data;
struct pw_module *module = d->module;
struct pw_factory *factory = d->this;
struct pw_impl_factory *factory = d->this;
struct spa_dict_item items[1];
char id[16];
int res;
snprintf(id, sizeof(id), "%d", pw_global_get_id(pw_module_get_global(module)));
items[0] = SPA_DICT_ITEM_INIT(PW_KEY_MODULE_ID, id);
pw_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
pw_impl_factory_update_properties(factory, &SPA_DICT_INIT(items, 1));
if ((res = pw_factory_register(factory, NULL)) < 0) {
if ((res = pw_impl_factory_register(factory, NULL)) < 0) {
pw_log_error(NAME" %p: can't register factory: %s", factory, spa_strerror(res));
}
}
@ -236,10 +236,10 @@ SPA_EXPORT
int pipewire__module_init(struct pw_module *module, const char *args)
{
struct pw_context *context = pw_module_get_context(module);
struct pw_factory *factory;
struct pw_impl_factory *factory;
struct factory_data *data;
factory = pw_factory_new(context,
factory = pw_impl_factory_new(context,
"spa-node-factory",
PW_TYPE_INTERFACE_Node,
PW_VERSION_NODE_PROXY,
@ -248,14 +248,14 @@ int pipewire__module_init(struct pw_module *module, const char *args)
if (factory == NULL)
return -errno;
data = pw_factory_get_user_data(factory);
data = pw_impl_factory_get_user_data(factory);
data->this = factory;
data->context = context;
data->module = module;
spa_list_init(&data->node_list);
pw_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_factory_set_implementation(factory, &factory_impl, data);
pw_impl_factory_add_listener(factory, &data->factory_listener, &factory_events, data);
pw_impl_factory_set_implementation(factory, &factory_impl, data);
pw_log_debug("module %p: new", module);
pw_module_add_listener(module, &data->module_listener, &module_events, data);