mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-31 22:25:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve naming

Browse source 
master -> driving
priority_master -> priority_driver
segment_master -> segment_owner
This commit is contained in:
Wim Taymans 2020-08-06 13:49:33 +02:00
parent 98b7dc7c0c
commit e71936f870
14 changed files with 63 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spa/include/spa/node/io.h
View file

@ -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

12
spa/plugins/audioconvert/audioadapter.c
View file

@ -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;
}

4
spa/plugins/videoconvert/videoadapter.c
View file

@ -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);
}