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

node: rename signal to signal_func

Browse source 
To avoid confusion and it is more easily greppable
This commit is contained in:
Wim Taymans 2022-08-11 12:34:51 +02:00
parent ca8b61e984
commit 1bc1d96f88
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -930,7 +930,7 @@ client_node_set_activation(void *_data,
link->map = mm; link->map = mm;
link->target.activation = ptr; link->target.activation = ptr;
link->signalfd = signalfd; link->signalfd = signalfd;
link->target.signal = link_signal_func; link->target.signal_func = link_signal_func;
link->target.data = link; link->target.data = link;
link->target.node = NULL; link->target.node = NULL;
spa_list_append(&data->links, &link->link); spa_list_append(&data->links, &link->link);

2
src/pipewire/impl-link.c
View file

@ -1264,7 +1264,7 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
impl->inode = input_node; impl->inode = input_node;
} }
this->rt.target.signal = impl->inode->rt.target.signal; this->rt.target.signal_func = impl->inode->rt.target.signal_func;
this->rt.target.data = impl->inode->rt.target.data; this->rt.target.data = impl->inode->rt.target.data;
pw_log_debug("%p: constructed out:%p:%d.%d -> in:%p:%d.%d", impl, pw_log_debug("%p: constructed out:%p:%d.%d -> in:%p:%d.%d", impl,

10
src/pipewire/impl-node.c
View file

@ -1047,7 +1047,7 @@ static inline int resume_node(struct pw_impl_node *this, int status)
if (pw_node_activation_state_dec(state, 1)) { if (pw_node_activation_state_dec(state, 1)) {
a->status = PW_NODE_ACTIVATION_TRIGGERED; a->status = PW_NODE_ACTIVATION_TRIGGERED;
a->signal_time = nsec; a->signal_time = nsec;
t->signal(t->data); t->signal_func(t->data);
} }
} }
return 0; return 0;
@ -1145,7 +1145,7 @@ static void node_on_fd_events(struct spa_source *source)
this->name, this->info.id, cmd - 1); this->name, this->info.id, cmd - 1);
pw_log_trace_fp("%p: got process", this); pw_log_trace_fp("%p: got process", this);
this->rt.target.signal(this->rt.target.data); this->rt.target.signal_func(this->rt.target.data);
} }
} }
@ -1262,9 +1262,9 @@ struct pw_impl_node *pw_context_create_node(struct pw_context *context,
this->rt.activation = this->activation->map->ptr; this->rt.activation = this->activation->map->ptr;
this->rt.target.activation = this->rt.activation; this->rt.target.activation = this->rt.activation;
this->rt.target.node = this; this->rt.target.node = this;
this->rt.target.signal = process_node; this->rt.target.signal_func = process_node;
this->rt.target.data = this; this->rt.target.data = this;
this->rt.driver_target.signal = process_node; this->rt.driver_target.signal_func = process_node;
reset_position(this, &this->rt.activation->position); reset_position(this, &this->rt.activation->position);
this->rt.activation->sync_timeout = DEFAULT_SYNC_TIMEOUT; this->rt.activation->sync_timeout = DEFAULT_SYNC_TIMEOUT;
@ -1613,7 +1613,7 @@ static int node_ready(void *data, int status)
state->pending, state->required); state->pending, state->required);
dump_states(node); dump_states(node);
} }
node->rt.target.signal(node->rt.target.data); node->rt.target.signal_func(node->rt.target.data);
} }
if (node->current_pending) { if (node->current_pending) {

2
src/pipewire/private.h
View file

@ -573,7 +573,7 @@ struct pw_node_target {
struct spa_list link; struct spa_list link;
struct pw_impl_node *node; struct pw_impl_node *node;
struct pw_node_activation *activation; struct pw_node_activation *activation;
int (*signal) (void *data); int (*signal_func) (void *data);
void *data; void *data;
unsigned int active:1; unsigned int active:1;
}; };