mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -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-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;
};