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

pw_node -> pw_impl_node

Browse source
This commit is contained in:
Wim Taymans 2019-12-11 12:41:45 +01:00
parent f62d1cb357
commit 898e870997
23 changed files with 335 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -60,7 +60,7 @@ struct factory_data {
struct node_data {
struct factory_data *data;
struct spa_list link;
struct pw_node *node;
struct pw_impl_node *node;
struct spa_hook node_listener;
struct spa_hook resource_listener;
};
@ -71,7 +71,7 @@ static void resource_destroy(void *data)
pw_log_debug("node %p", nd);
spa_hook_remove(&nd->resource_listener);
if (nd->node)
pw_node_destroy(nd->node);
pw_impl_node_destroy(nd->node);
}
static const struct pw_resource_events resource_events = {
@ -88,8 +88,8 @@ static void node_destroy(void *data)
nd->node = NULL;
}
static const struct pw_node_events node_events = {
PW_VERSION_NODE_EVENTS,
static const struct pw_impl_node_events node_events = {
PW_VERSION_IMPL_NODE_EVENTS,
.destroy = node_destroy,
};
@ -102,7 +102,7 @@ static void *create_object(void *_data,
{
struct factory_data *data = _data;
struct pw_context *context = data->context;
struct pw_node *node;
struct pw_impl_node *node;
const char *factory_name;
struct node_data *nd;
int res;
@ -138,12 +138,12 @@ static void *create_object(void *_data,
nd->node = node;
spa_list_append(&data->node_list, &nd->link);
pw_node_add_listener(node, &nd->node_listener, &node_events, nd);
pw_impl_node_add_listener(node, &nd->node_listener, &node_events, nd);
if (client) {
struct pw_resource *bound_resource;
res = pw_global_bind(pw_node_get_global(node),
res = pw_global_bind(pw_impl_node_get_global(node),
client,
PW_PERM_RWX,
version, new_id);
@ -194,7 +194,7 @@ static void factory_destroy(void *_data)
spa_hook_remove(&data->module_listener);
spa_list_consume(nd, &data->node_list, link)
pw_node_destroy(nd->node);
pw_impl_node_destroy(nd->node);
}
static const struct pw_impl_factory_events factory_events = {

6
src/modules/spa/module-node.c
View file

@ -45,7 +45,7 @@ static const struct spa_dict_item module_props[] = {
};
struct node_data {
struct pw_node *this;
struct pw_impl_node *this;
struct pw_context *context;
struct pw_properties *properties;
@ -56,7 +56,7 @@ static void module_destroy(void *_data)
{
struct node_data *data = _data;
spa_hook_remove(&data->module_listener);
pw_node_destroy(data->this);
pw_impl_node_destroy(data->this);
}
static const struct pw_impl_module_events module_events = {
@ -71,7 +71,7 @@ int pipewire__module_init(struct pw_impl_module *module, const char *args)
char **argv = NULL;
int n_tokens, res;
struct pw_context *context = pw_impl_module_get_context(module);
struct pw_node *node;
struct pw_impl_node *node;
struct node_data *data;
if (args == NULL)

36
src/modules/spa/spa-node.c
View file

@ -40,7 +40,7 @@
#include "pipewire/private.h"
struct impl {
struct pw_node *this;
struct pw_impl_node *this;
enum pw_spa_node_flags flags;
@ -59,7 +59,7 @@ struct impl {
static void spa_node_free(void *data)
{
struct impl *impl = data;
struct pw_node *node = impl->this;
struct pw_impl_node *node = impl->this;
pw_log_debug("spa-node %p: free", node);
@ -71,23 +71,23 @@ static void spa_node_free(void *data)
static void complete_init(struct impl *impl)
{
struct pw_node *this = impl->this;
struct pw_impl_node *this = impl->this;
impl->init_pending = SPA_ID_INVALID;
if (SPA_FLAG_IS_SET(impl->flags, PW_SPA_NODE_FLAG_ACTIVATE))
pw_node_set_active(this, true);
pw_impl_node_set_active(this, true);
if (!SPA_FLAG_IS_SET(impl->flags, PW_SPA_NODE_FLAG_NO_REGISTER))
pw_node_register(this, NULL);
pw_impl_node_register(this, NULL);
else
pw_node_initialized(this);
pw_impl_node_initialized(this);
}
static void spa_node_result(void *data, int seq, int res, uint32_t type, const void *result)
{
struct impl *impl = data;
struct pw_node *node = impl->this;
struct pw_impl_node *node = impl->this;
if (seq == impl->init_pending) {
pw_log_debug("spa-node %p: init complete event %d %d", node, seq, res);
@ -95,13 +95,13 @@ static void spa_node_result(void *data, int seq, int res, uint32_t type, const v
}
}
static const struct pw_node_events node_events = {
PW_VERSION_NODE_EVENTS,
static const struct pw_impl_node_events node_events = {
PW_VERSION_IMPL_NODE_EVENTS,
.free = spa_node_free,
.result = spa_node_result,
};
struct pw_node *
struct pw_impl_node *
pw_spa_node_new(struct pw_context *context,
enum pw_spa_node_flags flags,
struct spa_node *node,
@ -109,11 +109,11 @@ pw_spa_node_new(struct pw_context *context,
struct pw_properties *properties,
size_t user_data_size)
{
struct pw_node *this;
struct pw_impl_node *this;
struct impl *impl;
int res;
this = pw_node_new(context, properties, sizeof(struct impl) + user_data_size);
this = pw_impl_node_new(context, properties, sizeof(struct impl) + user_data_size);
if (this == NULL) {
res = -errno;
goto error_exit;
@ -128,8 +128,8 @@ pw_spa_node_new(struct pw_context *context,
if (user_data_size > 0)
impl->user_data = SPA_MEMBER(impl, sizeof(struct impl), void);
pw_node_add_listener(this, &impl->node_listener, &node_events, impl);
if ((res = pw_node_set_implementation(this, impl->node)) < 0)
pw_impl_node_add_listener(this, &impl->node_listener, &node_events, impl);
if ((res = pw_impl_node_set_implementation(this, impl->node)) < 0)
goto error_exit_clean_node;
if (flags & PW_SPA_NODE_FLAG_ASYNC) {
@ -140,7 +140,7 @@ pw_spa_node_new(struct pw_context *context,
return this;
error_exit_clean_node:
pw_node_destroy(this);
pw_impl_node_destroy(this);
handle = NULL;
error_exit:
if (handle)
@ -150,7 +150,7 @@ error_exit:
}
void *pw_spa_node_get_user_data(struct pw_node *node)
void *pw_spa_node_get_user_data(struct pw_impl_node *node)
{
struct impl *impl = node->user_data;
return impl->user_data;
@ -230,13 +230,13 @@ setup_props(struct pw_context *context, struct spa_node *spa_node, struct pw_pro
}
struct pw_node *pw_spa_node_load(struct pw_context *context,
struct pw_impl_node *pw_spa_node_load(struct pw_context *context,
const char *factory_name,
enum pw_spa_node_flags flags,
struct pw_properties *properties,
size_t user_data_size)
{
struct pw_node *this;
struct pw_impl_node *this;
struct impl *impl;
struct spa_node *spa_node;
int res;

6
src/modules/spa/spa-node.h
View file

@ -39,7 +39,7 @@ enum pw_spa_node_flags {
PW_SPA_NODE_FLAG_ASYNC = (1 << 2),
};
struct pw_node *
struct pw_impl_node *
pw_spa_node_new(struct pw_context *context,
enum pw_spa_node_flags flags,
struct spa_node *node,
@ -47,14 +47,14 @@ pw_spa_node_new(struct pw_context *context,
struct pw_properties *properties,
size_t user_data_size);
struct pw_node *
struct pw_impl_node *
pw_spa_node_load(struct pw_context *context,
const char *factory_name,
enum pw_spa_node_flags flags,
struct pw_properties *properties,
size_t user_data_size);
void *pw_spa_node_get_user_data(struct pw_node *node);
void *pw_spa_node_get_user_data(struct pw_impl_node *node);
#ifdef __cplusplus
}