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