<html><head></head><body>This terminology is IMU wrongly applied and inconsistent with the CLI.<br><br>This is not inclusive at all, just makes things more confusing and this exclusive of potential new contributors.<br><br>-1<br><br><div class="gmail_quote">Le 11 mars 2021 13:31:28 GMT+02:00, Thomas Guillem <thomas@gllm.fr> a écrit :<blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;">
<pre class="k9mail">In order to use more descriptive and inclusive terms.<br><br>No functional changes.<hr> src/audio_output/filters.c | 2 +-<br> src/clock/clock.c | 92 +++++++++++++++++++-------------------<br> src/clock/clock.h | 32 ++++++-------<br> src/input/es_out.c | 24 +++++-----<br> src/libvlc-module.c | 10 ++---<br> 5 files changed, 80 insertions(+), 80 deletions(-)<br><br>diff --git a/src/audio_output/filters.c b/src/audio_output/filters.c<br>index 4578051a41d..a1591548f55 100644<br>--- a/src/audio_output/filters.c<br>+++ b/src/audio_output/filters.c<br>@@ -507,7 +507,7 @@ aout_filters_t *aout_FiltersNewWithClock(vlc_object_t *obj, const vlc_clock_t *c<br> filters->count = 0;<br> if (clock)<br> {<br>- filters->clock = vlc_clock_CreateSlave(clock, AUDIO_ES);<br>+ filters->clock = vlc_clock_CreateClient(clock, AUDIO_ES);<br> if (!filters->clock)<br> goto error;<br> }<br>diff --git a/src/clock/clock.c b/src/clock/clock.c<br>index cfbb5eb6f6d..3147920028a 100644<br>--- a/src/clock/clock.c<br>+++ b/src/clock/clock.c<br>@@ -33,7 +33,7 @@ struct vlc_clock_main_t<br> vlc_mutex_t lock;<br> vlc_cond_t cond;<br> <br>- vlc_clock_t *master;<br>+ vlc_clock_t *driver;<br> <br> unsigned rc;<br> <br>@@ -51,7 +51,7 @@ struct vlc_clock_main_t<br> vlc_tick_t pause_date;<br> <br> unsigned wait_sync_ref_priority;<br>- clock_point_t wait_sync_ref; /* When the master */<br>+ clock_point_t wait_sync_ref; /* When the driver */<br> clock_point_t first_pcr;<br> vlc_tick_t output_dejitter; /* Delay used to absorb the output clock jitter */<br> vlc_tick_t input_dejitter; /* Delay used to absorb the input jitter */<br>@@ -109,7 +109,7 @@ static inline void vlc_clock_on_update(vlc_clock_t *clock,<br> clock->cbs_data);<br> }<br> <br>-static vlc_tick_t vlc_clock_master_update(vlc_clock_t *clock,<br>+static vlc_tick_t vlc_clock_driver_update(vlc_clock_t *clock,<br> vlc_tick_t system_now,<br> vlc_tick_t original_ts, double rate,<br> unsigned frame_rate,<br>@@ -164,7 +164,7 @@ static vlc_tick_t vlc_clock_master_update(vlc_clock_t *clock,<br> return VLC_TICK_INVALID;<br> }<br> <br>-static void vlc_clock_master_reset(vlc_clock_t *clock)<br>+static void vlc_clock_driver_reset(vlc_clock_t *clock)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> <br>@@ -173,7 +173,7 @@ static void vlc_clock_master_reset(vlc_clock_t *clock)<br> <br> assert(main_clock->delay <= 0);<br> assert(clock->delay >= 0);<br>- /* Move the delay from the slaves to the master */<br>+ /* Move the delay from the clients to the driver */<br> if (clock->delay != 0 && main_clock->delay != 0)<br> {<br> vlc_tick_t delta = clock->delay + main_clock->delay;<br>@@ -194,7 +194,7 @@ static void vlc_clock_master_reset(vlc_clock_t *clock)<br> vlc_clock_on_update(clock, VLC_TICK_INVALID, VLC_TICK_INVALID, 1.f, 0, 0);<br> }<br> <br>-static vlc_tick_t vlc_clock_master_set_delay(vlc_clock_t *clock, vlc_tick_t delay)<br>+static vlc_tick_t vlc_clock_driver_set_delay(vlc_clock_t *clock, vlc_tick_t delay)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> vlc_mutex_lock(&main_clock->lock);<br>@@ -203,13 +203,13 @@ static vlc_tick_t vlc_clock_master_set_delay(vlc_clock_t *clock, vlc_tick_t dela<br> <br> if (delta > 0)<br> {<br>- /* The master clock is delayed */<br>+ /* The driver clock is delayed */<br> main_clock->delay = 0;<br> clock->delay = delay;<br> }<br> else<br> {<br>- /* Delay all slaves clock instead of advancing the master one */<br>+ /* Delay all clients clock instead of advancing the driver one */<br> main_clock->delay = delta;<br> }<br> <br>@@ -250,7 +250,7 @@ vlc_clock_monotonic_to_system_locked(vlc_clock_t *clock, vlc_tick_t now,<br> + main_clock->wait_sync_ref.system;<br> }<br> <br>-static vlc_tick_t vlc_clock_slave_to_system_locked(vlc_clock_t *clock,<br>+static vlc_tick_t vlc_clock_client_to_system_locked(vlc_clock_t *clock,<br> vlc_tick_t now,<br> vlc_tick_t ts, double rate)<br> {<br>@@ -261,7 +261,7 @@ static vlc_tick_t vlc_clock_slave_to_system_locked(vlc_clock_t *clock,<br> vlc_tick_t system = main_stream_to_system(main_clock, ts);<br> if (system == VLC_TICK_INVALID)<br> {<br>- /* We don't have a master sync point, let's fallback to a monotonic ref<br>+ /* We don't have a driver sync point, let's fallback to a monotonic ref<br> * point */<br> system = vlc_clock_monotonic_to_system_locked(clock, now, ts, rate);<br> }<br>@@ -269,7 +269,7 @@ static vlc_tick_t vlc_clock_slave_to_system_locked(vlc_clock_t *clock,<br> return system + (clock->delay - main_clock->delay) * rate;<br> }<br> <br>-static vlc_tick_t vlc_clock_master_to_system_locked(vlc_clock_t *clock,<br>+static vlc_tick_t vlc_clock_driver_to_system_locked(vlc_clock_t *clock,<br> vlc_tick_t now,<br> vlc_tick_t ts, double rate)<br> {<br>@@ -277,7 +277,7 @@ static vlc_tick_t vlc_clock_master_to_system_locked(vlc_clock_t *clock,<br> vlc_tick_t system = main_stream_to_system(main_clock, ts);<br> if (system == VLC_TICK_INVALID)<br> {<br>- /* We don't have a master sync point, let's fallback to a monotonic ref<br>+ /* We don't have a driver sync point, let's fallback to a monotonic ref<br> * point */<br> system = vlc_clock_monotonic_to_system_locked(clock, now, ts, rate);<br> }<br>@@ -285,11 +285,11 @@ static vlc_tick_t vlc_clock_master_to_system_locked(vlc_clock_t *clock,<br> return system + clock->delay * rate;<br> }<br> <br>-static vlc_tick_t vlc_clock_slave_update(vlc_clock_t *clock,<br>- vlc_tick_t system_now,<br>- vlc_tick_t ts, double rate,<br>- unsigned frame_rate,<br>- unsigned frame_rate_base)<br>+static vlc_tick_t vlc_clock_client_update(vlc_clock_t *clock,<br>+ vlc_tick_t system_now,<br>+ vlc_tick_t ts, double rate,<br>+ unsigned frame_rate,<br>+ unsigned frame_rate_base)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> <br>@@ -311,7 +311,7 @@ static vlc_tick_t vlc_clock_slave_update(vlc_clock_t *clock,<br> return computed - system_now;<br> }<br> <br>-static void vlc_clock_slave_reset(vlc_clock_t *clock)<br>+static void vlc_clock_client_reset(vlc_clock_t *clock)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> vlc_mutex_lock(&main_clock->lock);<br>@@ -324,7 +324,7 @@ static void vlc_clock_slave_reset(vlc_clock_t *clock)<br> vlc_clock_on_update(clock, VLC_TICK_INVALID, VLC_TICK_INVALID, 1.0f, 0, 0);<br> }<br> <br>-static vlc_tick_t vlc_clock_slave_set_delay(vlc_clock_t *clock, vlc_tick_t delay)<br>+static vlc_tick_t vlc_clock_client_set_delay(vlc_clock_t *clock, vlc_tick_t delay)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> vlc_mutex_lock(&main_clock->lock);<br>@@ -337,7 +337,7 @@ static vlc_tick_t vlc_clock_slave_set_delay(vlc_clock_t *clock, vlc_tick_t delay<br> }<br> <br> void vlc_clock_Wait(vlc_clock_t *clock, vlc_tick_t system_now, vlc_tick_t ts,<br>- double rate, vlc_tick_t max_duration)<br>+ double rate, vlc_tick_t max_duration)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> vlc_mutex_lock(&main_clock->lock);<br>@@ -367,7 +367,7 @@ vlc_clock_main_t *vlc_clock_main_New(void)<br> <br> vlc_mutex_init(&main_clock->lock);<br> vlc_cond_init(&main_clock->cond);<br>- main_clock->master = NULL;<br>+ main_clock->driver = NULL;<br> main_clock->rc = 1;<br> <br> main_clock->coeff = 1.0f;<br>@@ -520,20 +520,20 @@ void vlc_clock_ConvertArrayToSystem(vlc_clock_t *clock, vlc_tick_t system_now,<br> vlc_mutex_unlock(&main_clock->lock);<br> }<br> <br>-static void vlc_clock_set_master_callbacks(vlc_clock_t *clock)<br>+static void vlc_clock_set_driver_callbacks(vlc_clock_t *clock)<br> {<br>- clock->update = vlc_clock_master_update;<br>- clock->reset = vlc_clock_master_reset;<br>- clock->set_delay = vlc_clock_master_set_delay;<br>- clock->to_system_locked = vlc_clock_master_to_system_locked;<br>+ clock->update = vlc_clock_driver_update;<br>+ clock->reset = vlc_clock_driver_reset;<br>+ clock->set_delay = vlc_clock_driver_set_delay;<br>+ clock->to_system_locked = vlc_clock_driver_to_system_locked;<br> }<br> <br>-static void vlc_clock_set_slave_callbacks(vlc_clock_t *clock)<br>+static void vlc_clock_set_client_callbacks(vlc_clock_t *clock)<br> {<br>- clock->update = vlc_clock_slave_update;<br>- clock->reset = vlc_clock_slave_reset;<br>- clock->set_delay = vlc_clock_slave_set_delay;<br>- clock->to_system_locked = vlc_clock_slave_to_system_locked;<br>+ clock->update = vlc_clock_client_update;<br>+ clock->reset = vlc_clock_client_reset;<br>+ clock->set_delay = vlc_clock_client_set_delay;<br>+ clock->to_system_locked = vlc_clock_client_to_system_locked;<br> }<br> <br> static vlc_clock_t *vlc_clock_main_Create(vlc_clock_main_t *main_clock,<br>@@ -555,30 +555,30 @@ static vlc_clock_t *vlc_clock_main_Create(vlc_clock_main_t *main_clock,<br> return clock;<br> }<br> <br>-vlc_clock_t *vlc_clock_main_CreateMaster(vlc_clock_main_t *main_clock,<br>+vlc_clock_t *vlc_clock_main_CreateDriver(vlc_clock_main_t *main_clock,<br> const struct vlc_clock_cbs *cbs,<br> void *cbs_data)<br> {<br>- /* The master has always the 0 priority */<br>+ /* The driver has always the 0 priority */<br> vlc_clock_t *clock = vlc_clock_main_Create(main_clock, 0, cbs, cbs_data);<br> if (!clock)<br> return NULL;<br> <br> vlc_mutex_lock(&main_clock->lock);<br>- assert(main_clock->master == NULL);<br>+ assert(main_clock->driver == NULL);<br> <br>- vlc_clock_set_master_callbacks(clock);<br>- main_clock->master = clock;<br>+ vlc_clock_set_driver_callbacks(clock);<br>+ main_clock->driver = clock;<br> main_clock->rc++;<br> vlc_mutex_unlock(&main_clock->lock);<br> <br> return clock;<br> }<br> <br>-vlc_clock_t *vlc_clock_main_CreateSlave(vlc_clock_main_t *main_clock,<br>- enum es_format_category_e cat,<br>- const struct vlc_clock_cbs *cbs,<br>- void *cbs_data)<br>+vlc_clock_t *vlc_clock_main_CreateClient(vlc_clock_main_t *main_clock,<br>+ enum es_format_category_e cat,<br>+ const struct vlc_clock_cbs *cbs,<br>+ void *cbs_data)<br> {<br> /* SPU outputs should have lower priority than VIDEO outputs since they<br> * necessarily depend on a VIDEO output. This mean that a SPU reference<br>@@ -603,27 +603,27 @@ vlc_clock_t *vlc_clock_main_CreateSlave(vlc_clock_main_t *main_clock,<br> return NULL;<br> <br> vlc_mutex_lock(&main_clock->lock);<br>- vlc_clock_set_slave_callbacks(clock);<br>+ vlc_clock_set_client_callbacks(clock);<br> main_clock->rc++;<br> vlc_mutex_unlock(&main_clock->lock);<br> <br> return clock;<br> }<br> <br>-vlc_clock_t *vlc_clock_CreateSlave(const vlc_clock_t *clock,<br>- enum es_format_category_e cat)<br>+vlc_clock_t *vlc_clock_CreateClient(const vlc_clock_t *clock,<br>+ enum es_format_category_e cat)<br> {<br>- return vlc_clock_main_CreateSlave(clock->owner, cat, NULL, NULL);<br>+ return vlc_clock_main_CreateClient(clock->owner, cat, NULL, NULL);<br> }<br> <br> void vlc_clock_Delete(vlc_clock_t *clock)<br> {<br> vlc_clock_main_t *main_clock = clock->owner;<br> vlc_mutex_lock(&main_clock->lock);<br>- if (clock == main_clock->master)<br>+ if (clock == main_clock->driver)<br> {<br> vlc_clock_main_reset(main_clock);<br>- main_clock->master = NULL;<br>+ main_clock->driver = NULL;<br> }<br> main_clock->rc--;<br> vlc_mutex_unlock(&main_clock->lock);<br>diff --git a/src/clock/clock.h b/src/clock/clock.h<br>index e7373391697..eef01d07d0e 100644<br>--- a/src/clock/clock.h<br>+++ b/src/clock/clock.h<br>@@ -20,11 +20,11 @@<br> #ifndef VLC_CLOCK_H<br> #define VLC_CLOCK_H<br> <br>-enum vlc_clock_master_source<br>+enum vlc_clock_driver_source<br> {<br>- VLC_CLOCK_MASTER_AUDIO = 0,<br>- VLC_CLOCK_MASTER_MONOTONIC,<br>- VLC_CLOCK_MASTER_DEFAULT = VLC_CLOCK_MASTER_AUDIO,<br>+ VLC_CLOCK_DRIVER_AUDIO = 0,<br>+ VLC_CLOCK_DRIVER_MONOTONIC,<br>+ VLC_CLOCK_DRIVER_DEFAULT = VLC_CLOCK_DRIVER_AUDIO,<br> };<br> <br> typedef struct vlc_clock_main_t vlc_clock_main_t;<br>@@ -94,33 +94,33 @@ void vlc_clock_main_ChangePause(vlc_clock_main_t *clock, vlc_tick_t system_now,<br> bool paused);<br> <br> /**<br>- * This function creates a new master vlc_clock_t interface<br>+ * This function creates a new driver vlc_clock_t interface<br> *<br>- * @warning There can be only one master at a given time.<br>+ * @warning There can be only one driver at a given time.<br> *<br> * You must use vlc_clock_Delete to free it.<br> */<br>-vlc_clock_t *vlc_clock_main_CreateMaster(vlc_clock_main_t *main_clock,<br>+vlc_clock_t *vlc_clock_main_CreateDriver(vlc_clock_main_t *main_clock,<br> const struct vlc_clock_cbs *cbs,<br> void *cbs_data);<br> <br> /**<br>- * This function creates a new slave vlc_clock_t interface<br>+ * This function creates a new client vlc_clock_t interface<br> *<br> * You must use vlc_clock_Delete to free it.<br> */<br>-vlc_clock_t *vlc_clock_main_CreateSlave(vlc_clock_main_t *main_clock,<br>- enum es_format_category_e cat,<br>- const struct vlc_clock_cbs *cbs,<br>- void *cbs_data);<br>+vlc_clock_t *vlc_clock_main_CreateClient(vlc_clock_main_t *main_clock,<br>+ enum es_format_category_e cat,<br>+ const struct vlc_clock_cbs *cbs,<br>+ void *cbs_data);<br> <br> /**<br>- * This function creates a new slave vlc_clock_t interface<br>+ * This function creates a new client vlc_clock_t interface<br> *<br> * You must use vlc_clock_Delete to free it.<br> */<br>-vlc_clock_t *vlc_clock_CreateSlave(const vlc_clock_t *clock,<br>- enum es_format_category_e cat);<br>+vlc_clock_t *vlc_clock_CreateClient(const vlc_clock_t *clock,<br>+ enum es_format_category_e cat);<br> <br> /**<br> * This function free the resources allocated by vlc_clock*Create*()<br>@@ -132,7 +132,7 @@ void vlc_clock_Delete(vlc_clock_t *clock);<br> * @param system_now valid system time or INT64_MAX is the updated point is<br> * forced (when paused for example)<br> * @return a valid drift relative time, VLC_TICK_INVALID if there is no drift<br>- * (clock is master) or INT64_MAX if the clock is paused<br>+ * (the clock is the driver) or INT64_MAX if the clock is paused<br> */<br> vlc_tick_t vlc_clock_Update(vlc_clock_t *clock, vlc_tick_t system_now,<br> vlc_tick_t ts, double rate);<br>diff --git a/src/input/es_out.c b/src/input/es_out.c<br>index b3b35621052..0ea8cb34ec9 100644<br>--- a/src/input/es_out.c<br>+++ b/src/input/es_out.c<br>@@ -182,7 +182,7 @@ typedef struct<br> struct vlc_list programs;<br> es_out_pgrm_t *p_pgrm; /* Master program */<br> <br>- enum es_format_category_e i_master_source_cat;<br>+ enum es_format_category_e i_driver_source_cat;<br> <br> /* all es */<br> int i_id;<br>@@ -516,16 +516,16 @@ es_out_t *input_EsOutNew( input_thread_t *p_input, input_source_t *main_source,<br> <br> p_sys->i_group_id = var_GetInteger( p_input, "program" );<br> <br>- enum vlc_clock_master_source master_source =<br>+ enum vlc_clock_driver_source driver_source =<br> var_InheritInteger( p_input, "clock-master" );<br>- switch( master_source )<br>+ switch( driver_source )<br> {<br>- case VLC_CLOCK_MASTER_AUDIO:<br>- p_sys->i_master_source_cat = AUDIO_ES;<br>+ case VLC_CLOCK_DRIVER_AUDIO:<br>+ p_sys->i_driver_source_cat = AUDIO_ES;<br> break;<br>- case VLC_CLOCK_MASTER_MONOTONIC:<br>+ case VLC_CLOCK_DRIVER_MONOTONIC:<br> default:<br>- p_sys->i_master_source_cat = UNKNOWN_ES;<br>+ p_sys->i_driver_source_cat = UNKNOWN_ES;<br> break;<br> }<br> <br>@@ -2165,20 +2165,20 @@ static void EsOutCreateDecoder( es_out_t *out, es_out_id_t *p_es )<br> assert( p_es->p_pgrm );<br> <br> if( p_es->fmt.i_cat != UNKNOWN_ES<br>- && p_es->fmt.i_cat == p_sys->i_master_source_cat<br>+ && p_es->fmt.i_cat == p_sys->i_driver_source_cat<br> && p_es->p_pgrm->p_master_clock == NULL )<br> {<br> p_es->master = true;<br> p_es->p_pgrm->p_master_clock = p_es->p_clock =<br>- vlc_clock_main_CreateMaster( p_es->p_pgrm->p_main_clock,<br>+ vlc_clock_main_CreateDriver( p_es->p_pgrm->p_main_clock,<br> &clock_cbs, p_es );<br> }<br> else<br> {<br> p_es->master = false;<br>- p_es->p_clock = vlc_clock_main_CreateSlave( p_es->p_pgrm->p_main_clock,<br>- p_es->fmt.i_cat,<br>- &clock_cbs, p_es );<br>+ p_es->p_clock = vlc_clock_main_CreateClient( p_es->p_pgrm->p_main_clock,<br>+ p_es->fmt.i_cat,<br>+ &clock_cbs, p_es );<br> }<br> <br> if( !p_es->p_clock )<br>diff --git a/src/libvlc-module.c b/src/libvlc-module.c<br>index 16d96d53b5c..acfff58fe91 100644<br>--- a/src/libvlc-module.c<br>+++ b/src/libvlc-module.c<br>@@ -536,11 +536,11 @@ static const char *const screensaver_texts[] = {<br> "This defines the maximum input delay jitter that the synchronization " \<br> "algorithms should try to compensate (in milliseconds)." )<br> <br>-#define CLOCK_MASTER_TEXT N_("Clock master source")<br>+#define CLOCK_DRIVER_TEXT N_("Clock driver source")<br> <br> static const int pi_clock_master_values[] = {<br>- VLC_CLOCK_MASTER_AUDIO,<br>- VLC_CLOCK_MASTER_MONOTONIC,<br>+ VLC_CLOCK_DRIVER_AUDIO,<br>+ VLC_CLOCK_DRIVER_MONOTONIC,<br> };<br> static const char *const ppsz_clock_master_descriptions[] = {<br> N_("Audio"),<br>@@ -1977,8 +1977,8 @@ vlc_module_begin ()<br> add_integer( "clock-jitter", 5000, CLOCK_JITTER_TEXT,<br> CLOCK_JITTER_LONGTEXT, true )<br> change_safe()<br>- add_integer( "clock-master", VLC_CLOCK_MASTER_DEFAULT,<br>- CLOCK_MASTER_TEXT, NULL, true )<br>+ add_integer( "clock-master", VLC_CLOCK_DRIVER_DEFAULT,<br>+ CLOCK_DRIVER_TEXT, NULL, true )<br> change_integer_list( pi_clock_master_values, ppsz_clock_master_descriptions )<br> <br> add_directory("input-record-path", NULL,</pre></blockquote></div><br>-- <br>Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.</body></html>