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

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

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));