mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-07 13:30:09 -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

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

@ -63,8 +63,8 @@ struct factory_data {
struct node_data {
struct factory_data *data;
struct spa_list link;
struct pw_node *adapter;
struct pw_node *slave;
struct pw_impl_node *adapter;
struct pw_impl_node *slave;
struct spa_hook adapter_listener;
struct pw_resource *resource;
struct spa_hook resource_listener;
@ -77,7 +77,7 @@ static void resource_destroy(void *data)
spa_hook_remove(&nd->resource_listener);
if (nd->adapter)
pw_node_destroy(nd->adapter);
pw_impl_node_destroy(nd->adapter);
}
static const struct pw_resource_events resource_events = {
@ -95,7 +95,7 @@ static void node_destroy(void *data)
static void node_free(void *data)
{
struct node_data *nd = data;
pw_node_destroy(nd->slave);
pw_impl_node_destroy(nd->slave);
}
static void node_initialized(void *data)
@ -110,7 +110,7 @@ static void node_initialized(void *data)
return;
client = pw_resource_get_client(nd->resource);
global = pw_node_get_global(nd->adapter);
global = pw_impl_node_get_global(nd->adapter);
res = pw_global_bind(global, client,
PW_PERM_RWX, PW_VERSION_NODE_PROXY, nd->new_id);
@ -129,8 +129,8 @@ error_bind:
}
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,
.free = node_free,
.initialized = node_initialized,
@ -145,7 +145,7 @@ static void *create_object(void *_data,
{
struct factory_data *d = _data;
struct pw_impl_client *client;
struct pw_node *adapter, *slave;
struct pw_impl_node *adapter, *slave;
const char *str, *factory_name;
int res;
struct node_data *nd;
@ -205,11 +205,11 @@ static void *create_object(void *_data,
nd->new_id = new_id;
spa_list_append(&d->node_list, &nd->link);
pw_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
pw_impl_node_add_listener(adapter, &nd->adapter_listener, &node_events, nd);
pw_node_register(adapter, NULL);
pw_impl_node_register(adapter, NULL);
pw_node_set_active(adapter, true);
pw_impl_node_set_active(adapter, true);
return adapter;
@ -251,7 +251,7 @@ static void module_destroy(void *data)
spa_hook_remove(&d->module_listener);
spa_list_for_each_safe(nd, t, &d->node_list, link)
pw_node_destroy(nd->adapter);
pw_impl_node_destroy(nd->adapter);
pw_impl_factory_destroy(d->this);
}

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

@ -58,10 +58,10 @@ struct buffer {
struct node {
struct pw_context *context;
struct pw_node *node;
struct pw_impl_node *node;
struct spa_hook node_listener;
struct pw_node *slave;
struct pw_impl_node *slave;
void *user_data;
enum pw_direction direction;
@ -149,14 +149,14 @@ static void node_port_init(void *data, struct pw_impl_port *port)
pw_properties_free(new);
}
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 = node_free,
.port_init = node_port_init,
};
static int find_format(struct pw_node *node, enum pw_direction direction,
static int find_format(struct pw_impl_node *node, enum pw_direction direction,
uint32_t *media_type, uint32_t *media_subtype)
{
uint32_t state = 0;
@ -186,12 +186,12 @@ static int find_format(struct pw_node *node, enum pw_direction direction,
}
struct pw_node *pw_adapter_new(struct pw_context *context,
struct pw_node *slave,
struct pw_impl_node *pw_adapter_new(struct pw_context *context,
struct pw_impl_node *slave,
struct pw_properties *props,
size_t user_data_size)
{
struct pw_node *node;
struct pw_impl_node *node;
struct node *n;
const char *str, *factory_name;
const struct pw_node_info *info;
@ -199,7 +199,7 @@ struct pw_node *pw_adapter_new(struct pw_context *context,
int res;
uint32_t media_type, media_subtype;
info = pw_node_get_info(slave);
info = pw_impl_node_get_info(slave);
if (info == NULL) {
res = -EINVAL;
goto error;
@ -279,7 +279,7 @@ struct pw_node *pw_adapter_new(struct pw_context *context,
if (user_data_size > 0)
n->user_data = SPA_MEMBER(n, sizeof(struct node), void);
pw_node_add_listener(node, &n->node_listener, &node_events, n);
pw_impl_node_add_listener(node, &n->node_listener, &node_events, n);
return node;
@ -290,7 +290,7 @@ error:
return NULL;
}
void *pw_adapter_get_user_data(struct pw_node *node)
void *pw_adapter_get_user_data(struct pw_impl_node *node)
{
struct node *n = pw_spa_node_get_user_data(node);
return n->user_data;

6
src/modules/module-adapter/adapter.h
View file

@ -33,13 +33,13 @@ extern "C" {
#define ADAPTER_USAGE PW_KEY_NODE_NAME"=<string> "
struct pw_node *
struct pw_impl_node *
pw_adapter_new(struct pw_context *context,
struct pw_node *slave,
struct pw_impl_node *slave,
struct pw_properties *properties,
size_t user_data_size);
void *pw_adapter_get_user_data(struct pw_node *node);
void *pw_adapter_get_user_data(struct pw_impl_node *node);
#ifdef __cplusplus
}

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

@ -862,7 +862,7 @@ static int impl_node_process(void *object)
{
struct node *this = object;
struct impl *impl = this->impl;
struct pw_node *n = impl->this.node;
struct pw_impl_node *n = impl->this.node;
struct timespec ts;
spa_log_trace_fp(this->log, "%p: send process driver:%p", this, impl->this.node->driver_node);
@ -971,7 +971,7 @@ client_node_port_update(void *data,
static int client_node_set_active(void *data, bool active)
{
struct impl *impl = data;
return pw_node_set_active(impl->this.node, active);
return pw_impl_node_set_active(impl->this.node, active);
}
static int client_node_event(void *data, const struct spa_event *event)
@ -1173,7 +1173,7 @@ static void client_node_resource_destroy(void *data)
&node->data_source);
}
if (this->node)
pw_node_destroy(this->node);
pw_impl_node_destroy(this->node);
}
static void client_node_resource_error(void *data, int seq, int res, const char *message)
@ -1199,7 +1199,7 @@ static void client_node_resource_pong(void *data, int seq)
void pw_client_node_registered(struct pw_client_node *this, struct pw_global *global)
{
struct impl *impl = SPA_CONTAINER_OF(this, struct impl, this);
struct pw_node *node = this->node;
struct pw_impl_node *node = this->node;
struct pw_impl_client *client = impl->node.client;
uint32_t node_id = global->id;
struct pw_memblock *m;
@ -1262,7 +1262,7 @@ static void node_initialized(void *data)
pw_log_debug(NAME " %p: io areas %p", node, impl->io_areas->map->ptr);
if ((global = pw_node_get_global(this->node)) != NULL)
if ((global = pw_impl_node_get_global(this->node)) != NULL)
pw_client_node_registered(this, global);
}
@ -1505,7 +1505,7 @@ static void node_port_removed(void *data, struct pw_impl_port *port)
clear_port(this, p);
}
static void node_peer_added(void *data, struct pw_node *peer)
static void node_peer_added(void *data, struct pw_impl_node *peer)
{
struct impl *impl = data;
struct node *this = &impl->node;
@ -1533,7 +1533,7 @@ static void node_peer_added(void *data, struct pw_node *peer)
sizeof(struct pw_node_activation));
}
static void node_peer_removed(void *data, struct pw_node *peer)
static void node_peer_removed(void *data, struct pw_impl_node *peer)
{
struct impl *impl = data;
struct node *this = &impl->node;
@ -1563,7 +1563,7 @@ static void node_peer_removed(void *data, struct pw_node *peer)
pw_memblock_unref(m);
}
static void node_driver_changed(void *data, struct pw_node *old, struct pw_node *driver)
static void node_driver_changed(void *data, struct pw_impl_node *old, struct pw_impl_node *driver)
{
struct impl *impl = data;
struct node *this = &impl->node;
@ -1574,8 +1574,8 @@ static void node_driver_changed(void *data, struct pw_node *old, struct pw_node
node_peer_added(data, driver);
}
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 = node_free,
.initialized = node_initialized,
.port_init = node_port_init,
@ -1608,7 +1608,7 @@ static int process_node(void *data)
* \param properties extra properties
* \return a newly allocated client node
*
* Create a new \ref pw_node.
* Create a new \ref pw_impl_node.
*
* \memberof pw_client_node
*/
@ -1682,7 +1682,7 @@ struct pw_client_node *pw_client_node_new(struct pw_resource *resource,
this->node->port_user_data_size = sizeof(struct port);
pw_node_add_listener(this->node, &impl->node_listener, &node_events, impl);
pw_impl_node_add_listener(this->node, &impl->node_listener, &node_events, impl);
return this;

2
src/modules/module-client-node/client-node.h
View file

@ -37,7 +37,7 @@ extern "C" {
* PipeWire client node interface
*/
struct pw_client_node {
struct pw_node *node;
struct pw_impl_node *node;
struct pw_resource *resource;
uint32_t flags;

46
src/modules/module-client-node/remote-node.c
View file

@ -80,7 +80,7 @@ struct node_data {
struct spa_list mix[2];
struct spa_list free_mix;
struct pw_node *node;
struct pw_impl_node *node;
struct spa_hook node_listener;
int do_free:1;
int have_transport:1;
@ -222,7 +222,7 @@ static struct mix *ensure_mix(struct node_data *data,
if (spa_list_is_empty(&data->free_mix))
return NULL;
port = pw_node_find_port(data->node, direction, port_id);
port = pw_impl_node_find_port(data->node, direction, port_id);
if (port == NULL)
return NULL;
@ -271,7 +271,7 @@ static int client_node_transport(void *object,
static int add_node_update(struct pw_proxy *proxy, uint32_t change_mask)
{
struct node_data *data = proxy->user_data;
struct pw_node *node = data->node;
struct pw_impl_node *node = data->node;
struct spa_node_info ni = SPA_NODE_INFO_INIT();
uint32_t n_params = 0;
struct spa_pod **params = NULL;
@ -458,7 +458,7 @@ static int client_node_command(void *object, const struct spa_command *command)
case SPA_NODE_COMMAND_Pause:
pw_log_debug("node %p: pause", proxy);
if ((res = pw_node_set_state(data->node, PW_NODE_STATE_IDLE)) < 0) {
if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_IDLE)) < 0) {
pw_log_warn("node %p: pause failed", proxy);
pw_proxy_error(proxy, res, "pause failed");
}
@ -467,7 +467,7 @@ static int client_node_command(void *object, const struct spa_command *command)
case SPA_NODE_COMMAND_Start:
pw_log_debug("node %p: start", proxy);
if ((res = pw_node_set_state(data->node, PW_NODE_STATE_RUNNING)) < 0) {
if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_RUNNING)) < 0) {
pw_log_warn("node %p: start failed", proxy);
pw_proxy_error(proxy, res, "start failed");
}
@ -475,7 +475,7 @@ static int client_node_command(void *object, const struct spa_command *command)
case SPA_NODE_COMMAND_Suspend:
pw_log_debug("node %p: suspend", proxy);
if ((res = pw_node_set_state(data->node, PW_NODE_STATE_SUSPENDED)) < 0) {
if ((res = pw_impl_node_set_state(data->node, PW_NODE_STATE_SUSPENDED)) < 0) {
pw_log_warn("node %p: suspend failed", proxy);
pw_proxy_error(proxy, res, "suspend failed");
}
@ -542,7 +542,7 @@ client_node_port_set_param(void *object,
struct pw_impl_port *port;
int res;
port = pw_node_find_port(data->node, direction, port_id);
port = pw_impl_node_find_port(data->node, direction, port_id);
if (port == NULL) {
res = -EINVAL;
goto error_exit;
@ -804,7 +804,7 @@ client_node_set_activation(void *object,
{
struct pw_proxy *proxy = object;
struct node_data *data = proxy->user_data;
struct pw_node *node = data->node;
struct pw_impl_node *node = data->node;
struct pw_memmap *mm;
void *ptr;
struct link *link;
@ -992,8 +992,8 @@ static void node_active_changed(void *data, bool active)
pw_client_node_proxy_set_active(d->client_node, active);
}
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,
.free = node_free,
.info_changed = node_info_changed,
@ -1017,7 +1017,7 @@ static void client_node_proxy_destroy(void *_data)
pw_proxy_destroy(data->proxy);
if (data->do_free)
pw_node_destroy(data->node);
pw_impl_node_destroy(data->node);
}
static void client_node_proxy_bound(void *_data, uint32_t global_id)
@ -1054,7 +1054,7 @@ static const struct pw_proxy_events proxy_events = {
static int node_ready(void *d, int status)
{
struct node_data *data = d;
struct pw_node *node = data->node;
struct pw_impl_node *node = data->node;
struct pw_node_activation *a = node->rt.activation;
struct timespec ts;
struct pw_impl_port *p;
@ -1086,7 +1086,7 @@ static int node_reuse_buffer(void *data, uint32_t port_id, uint32_t buffer_id)
static int node_xrun(void *d, uint64_t trigger, uint64_t delay, struct spa_pod *info)
{
struct node_data *data = d;
struct pw_node *node = data->node;
struct pw_impl_node *node = data->node;
struct pw_node_activation *a = node->rt.activation;
a->xrun_count++;
@ -1110,7 +1110,7 @@ static const struct spa_node_callbacks node_callbacks = {
static struct pw_proxy *node_export(struct pw_core *core, void *object, bool do_free,
size_t user_data_size)
{
struct pw_node *node = object;
struct pw_impl_node *node = object;
struct pw_proxy *client_node;
struct node_data *data;
int i;
@ -1128,7 +1128,7 @@ static struct pw_proxy *node_export(struct pw_core *core, void *object, bool do_
data->pool = pw_core_get_mempool(core);
data->node = node;
data->do_free = do_free;
data->context = pw_node_get_context(node);
data->context = pw_impl_node_get_context(node);
data->client_node = (struct pw_client_node_proxy *)client_node;
data->remote_id = SPA_ID_INVALID;
@ -1148,7 +1148,7 @@ static struct pw_proxy *node_export(struct pw_core *core, void *object, bool do_
&client_node_proxy_events, data);
spa_node_set_callbacks(node->node, &node_callbacks, data);
pw_node_add_listener(node, &data->node_listener, &node_events, data);
pw_impl_node_add_listener(node, &data->node_listener, &node_events, data);
pw_client_node_proxy_add_listener(data->client_node,
&data->client_node_listener,
@ -1168,10 +1168,10 @@ struct pw_proxy *pw_core_node_export(struct pw_core *core,
uint32_t type, struct pw_properties *props, void *object,
size_t user_data_size)
{
struct pw_node *node = object;
struct pw_impl_node *node = object;
if (props) {
pw_node_update_properties(node, &props->dict);
pw_impl_node_update_properties(node, &props->dict);
pw_properties_free(props);
}
return node_export(core, object, false, user_data_size);
@ -1181,15 +1181,15 @@ struct pw_proxy *pw_core_spa_node_export(struct pw_core *core,
uint32_t type, struct pw_properties *props, void *object,
size_t user_data_size)
{
struct pw_node *node;
struct pw_impl_node *node;
node = pw_node_new(pw_core_get_context(core), props, 0);
node = pw_impl_node_new(pw_core_get_context(core), props, 0);
if (node == NULL)
return NULL;
pw_node_set_implementation(node, (struct spa_node*)object);
pw_node_register(node, NULL);
pw_node_set_active(node, true);
pw_impl_node_set_implementation(node, (struct spa_node*)object);
pw_impl_node_register(node, NULL);
pw_impl_node_set_active(node, true);
return node_export(core, node, true, user_data_size);
}

18
src/modules/module-client-node/v0/client-node.c
View file

@ -846,7 +846,7 @@ static int impl_node_process(void *object)
{
struct node *this = object;
struct impl *impl = this->impl;
struct pw_node *n = impl->this.node;
struct pw_impl_node *n = impl->this.node;
return impl_node_process_input(n->node);
}
@ -1001,7 +1001,7 @@ client_node0_port_update(void *data,
static void client_node0_set_active(void *data, bool active)
{
struct impl *impl = data;
pw_node_set_active(impl->this.node, active);
pw_impl_node_set_active(impl->this.node, active);
}
static void client_node0_event(void *data, struct spa_event *event)
@ -1158,14 +1158,14 @@ static void client_node0_resource_destroy(void *data)
true,
&node->data_source);
}
pw_node_destroy(this->node);
pw_impl_node_destroy(this->node);
}
static void node_initialized(void *data)
{
struct impl *impl = data;
struct pw_client_node0 *this = &impl->this;
struct pw_node *node = this->node;
struct pw_impl_node *node = this->node;
struct spa_system *data_system = impl->node.data_system;
if (this->resource == NULL)
@ -1182,7 +1182,7 @@ static void node_initialized(void *data)
pw_log_debug("client-node %p: transport fd %d %d", node, impl->fds[0], impl->fds[1]);
pw_client_node0_resource_transport(this->resource,
pw_global_get_id(pw_node_get_global(node)),
pw_global_get_id(pw_impl_node_get_global(node)),
impl->other_fds[0],
impl->other_fds[1],
impl->transport);
@ -1210,8 +1210,8 @@ static void node_free(void *data)
free(impl);
}
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 = node_free,
.initialized = node_initialized,
};
@ -1246,7 +1246,7 @@ static void convert_properties(struct pw_properties *properties)
* \param properties extra properties
* \return a newly allocated client node
*
* Create a new \ref pw_node.
* Create a new \ref pw_impl_node.
*
* \memberof pw_client_node
*/
@ -1320,7 +1320,7 @@ struct pw_client_node0 *pw_client_node0_new(struct pw_resource *resource,
impl);
pw_node_add_listener(this->node, &impl->node_listener, &node_events, impl);
pw_impl_node_add_listener(this->node, &impl->node_listener, &node_events, impl);
return this;

2
src/modules/module-client-node/v0/client-node.h
View file

@ -33,7 +33,7 @@ extern "C" {
* PipeWire client node interface
*/
struct pw_client_node0 {
struct pw_node *node;
struct pw_impl_node *node;
struct pw_resource *resource;
};

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

@ -142,17 +142,17 @@ static const struct pw_impl_link_events link_events = {
.initialized = link_initialized
};
static struct pw_impl_port *get_port(struct pw_node *node, enum spa_direction direction)
static struct pw_impl_port *get_port(struct pw_impl_node *node, enum spa_direction direction)
{
struct pw_impl_port *p;
int res;
p = pw_node_find_port(node, direction, SPA_ID_INVALID);
p = pw_impl_node_find_port(node, direction, SPA_ID_INVALID);
if (p == NULL || pw_impl_port_is_linked(p)) {
uint32_t port_id;
port_id = pw_node_get_free_port_id(node, direction);
port_id = pw_impl_node_get_free_port_id(node, direction);
if (port_id == SPA_ID_INVALID)
return NULL;
@ -179,7 +179,7 @@ static void *create_object(void *_data,
{
struct factory_data *d = _data;
struct pw_impl_client *client = NULL;
struct pw_node *output_node, *input_node;
struct pw_impl_node *output_node, *input_node;
struct pw_impl_port *outport, *inport;
struct pw_context *context;
struct pw_global *global;

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
}