Improve naming

master -> driving
priority_master -> priority_driver
segment_master -> segment_owner

3 files changed, 9 insertions, 9 deletions

diff --git a/spa/include/spa/node/io.h b/spa/include/spa/node/io.h
index eebc62a9..bddd15a5 100644
--- a/spa/include/spa/node/io.h
+++ b/spa/include/spa/node/io.h
@@ -254,7 +254,7 @@ enum spa_io_position_state {
  * The position information adds extra meaning to the raw clock times.
  *
  * It is set on all nodes and the clock id will contain the clock of the
- * master node in the graph.
+ * driving node in the graph.
  *
  * The position information contains 1 or more segments that convert the
  * raw clock times to a stream time. They are sorted based on their
diff --git a/spa/plugins/audioconvert/audioadapter.c b/spa/plugins/audioconvert/audioadapter.c
index 4cffdc2a..6a777bdf 100644
--- a/spa/plugins/audioconvert/audioadapter.c
+++ b/spa/plugins/audioconvert/audioadapter.c
@@ -82,7 +82,7 @@ struct impl {
 	unsigned int add_listener:1;
 	unsigned int have_format:1;
 	unsigned int started:1;
-	unsigned int master:1;
+	unsigned int driver:1;
 };
 
 /** \endcond */
@@ -655,7 +655,7 @@ static int follower_ready(void *data, int status)
 
 	spa_log_trace_fp(this->log, NAME " %p: ready %d", this, status);
 
-	this->master = true;
+	this->driver = true;
 
 	if (this->direction == SPA_DIRECTION_OUTPUT)
 		status = spa_node_process(this->convert);
@@ -880,8 +880,8 @@ static int impl_node_process(void *object)
 	struct impl *this = object;
 	int status = 0;
 
-	spa_log_trace_fp(this->log, "%p: process convert:%p master:%d",
-			this, this->convert, this->master);
+	spa_log_trace_fp(this->log, "%p: process convert:%p driver:%d",
+			this, this->convert, this->driver);
 
 	if (this->direction == SPA_DIRECTION_INPUT) {
 		if (this->convert)
@@ -892,7 +892,7 @@ static int impl_node_process(void *object)
 		status = spa_node_process(this->follower);
 
 	if (this->direction == SPA_DIRECTION_OUTPUT &&
-	    !this->master && this->convert) {
+	    !this->driver && this->convert) {
 		while (status > 0) {
 			status = spa_node_process(this->convert);
 			if (status & (SPA_STATUS_HAVE_DATA | SPA_STATUS_DRAINED))
@@ -906,7 +906,7 @@ static int impl_node_process(void *object)
 	}
 	spa_log_trace_fp(this->log, "%p: process status:%d", this, status);
 
-	this->master = false;
+	this->driver = false;
 
 	return status;
 }
diff --git a/spa/plugins/videoconvert/videoadapter.c b/spa/plugins/videoconvert/videoadapter.c
index 8555f4c3..f150d48c 100644
--- a/spa/plugins/videoconvert/videoadapter.c
+++ b/spa/plugins/videoconvert/videoadapter.c
@@ -78,7 +78,7 @@ struct impl {
 	unsigned int started:1;
 	unsigned int active:1;
 	unsigned int driver:1;
-	unsigned int master:1;
+	unsigned int driving:1;
 	unsigned int monitor:1;
 };
 
@@ -775,7 +775,7 @@ static int impl_node_process(void *object)
 	if (this->monitor)
 		status |= SPA_STATUS_HAVE_DATA;
 
-	if (this->direction == SPA_DIRECTION_OUTPUT && !this->master) {
+	if (this->direction == SPA_DIRECTION_OUTPUT && !this->driving) {
 		if (this->use_converter)
 			status = spa_node_process(this->convert);
 	}