From 1bc1d96f889593222f57eaa220d4bec03a1d3fac Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Thu, 11 Aug 2022 12:34:51 +0200
Subject: [PATCH] node: rename signal to signal_func

To avoid confusion and it is more easily greppable
---
 src/modules/module-client-node/remote-node.c |  2 +-
 src/pipewire/impl-link.c                     |  2 +-
 src/pipewire/impl-node.c                     | 10 +++++-----
 src/pipewire/private.h                       |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/module-client-node/remote-node.c b/src/modules/module-client-node/remote-node.c
index c0af9a21f..6d520427f 100644
--- a/src/modules/module-client-node/remote-node.c
+++ b/src/modules/module-client-node/remote-node.c
@@ -930,7 +930,7 @@ client_node_set_activation(void *_data,
 		link->map = mm;
 		link->target.activation = ptr;
 		link->signalfd = signalfd;
-		link->target.signal = link_signal_func;
+		link->target.signal_func = link_signal_func;
 		link->target.data = link;
 		link->target.node = NULL;
 		spa_list_append(&data->links, &link->link);
diff --git a/src/pipewire/impl-link.c b/src/pipewire/impl-link.c
index 3a7f66d40..26f817d25 100644
--- a/src/pipewire/impl-link.c
+++ b/src/pipewire/impl-link.c
@@ -1264,7 +1264,7 @@ struct pw_impl_link *pw_context_create_link(struct pw_context *context,
 		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;
 
 	pw_log_debug("%p: constructed out:%p:%d.%d -> in:%p:%d.%d", impl,
diff --git a/src/pipewire/impl-node.c b/src/pipewire/impl-node.c
index e654b979d..55851a68e 100644
--- a/src/pipewire/impl-node.c
+++ b/src/pipewire/impl-node.c
@@ -1047,7 +1047,7 @@ static inline int resume_node(struct pw_impl_node *this, int status)
 		if (pw_node_activation_state_dec(state, 1)) {
 			a->status = PW_NODE_ACTIVATION_TRIGGERED;
 			a->signal_time = nsec;
-			t->signal(t->data);
+			t->signal_func(t->data);
 		}
 	}
 	return 0;
@@ -1145,7 +1145,7 @@ static void node_on_fd_events(struct spa_source *source)
 				this->name, this->info.id, cmd - 1);
 
 		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.target.activation = this->rt.activation;
 	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.driver_target.signal = process_node;
+	this->rt.driver_target.signal_func = process_node;
 
 	reset_position(this, &this->rt.activation->position);
 	this->rt.activation->sync_timeout = DEFAULT_SYNC_TIMEOUT;
@@ -1613,7 +1613,7 @@ static int node_ready(void *data, int status)
 						state->pending, state->required);
 				dump_states(node);
 			}
-			node->rt.target.signal(node->rt.target.data);
+			node->rt.target.signal_func(node->rt.target.data);
 		}
 
 		if (node->current_pending) {
diff --git a/src/pipewire/private.h b/src/pipewire/private.h
index b892074a6..354475437 100644
--- a/src/pipewire/private.h
+++ b/src/pipewire/private.h
@@ -573,7 +573,7 @@ struct pw_node_target {
 	struct spa_list link;
 	struct pw_impl_node *node;
 	struct pw_node_activation *activation;
-	int (*signal) (void *data);
+	int (*signal_func) (void *data);
 	void *data;
 	unsigned int active:1;
 };