[vlc-devel] [PATCH 3/4] es_out: rename: s/master_clock/driver_clock

[Thomas Guillem]

In order to use more descriptive and inclusive terms.

No functional changes.
---
 src/input/es_out.c | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 18f907047e4..10ce2cbab65 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -77,7 +77,7 @@ typedef struct
     /* Clock for this program */
     input_clock_t    *p_input_clock;
     vlc_clock_main_t *p_main_clock;
-    vlc_clock_t      *p_master_clock;
+    vlc_clock_t      *p_driver_clock;
 
     vlc_tick_t i_last_pcr;
 
@@ -133,7 +133,7 @@ struct es_out_id_t
     vlc_clock_t *p_clock;
 
     /* Used by vlc_clock_cbs, need to be const during the lifetime of the clock */
-    bool master;
+    bool is_driver;
 
     vlc_tick_t i_pts_level;
     vlc_tick_t delay;
@@ -1381,7 +1381,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, input_source_t *source, in
     p_pgrm->i_last_pcr = VLC_TICK_INVALID;
     p_pgrm->p_meta = NULL;
 
-    p_pgrm->p_master_clock = NULL;
+    p_pgrm->p_driver_clock = NULL;
     p_pgrm->p_input_clock = input_clock_New( p_sys->rate );
     p_pgrm->p_main_clock = vlc_clock_main_New();
     if( !p_pgrm->p_input_clock || !p_pgrm->p_main_clock )
@@ -2084,7 +2084,7 @@ static es_out_id_t *EsOutAddLocked( es_out_t *out, input_source_t *source,
     es->p_dec = NULL;
     es->p_dec_record = NULL;
     es->p_clock = NULL;
-    es->master = false;
+    es->is_driver = false;
     es->cc.type = 0;
     es->cc.i_bitmap = 0;
     es->p_master = p_master;
@@ -2148,8 +2148,8 @@ static void ClockUpdate(vlc_tick_t system_ts, vlc_tick_t ts, double rate,
     es_out_id_t *es = data;
     es_out_sys_t *p_sys = container_of(es->out, es_out_sys_t, out);
 
-    input_SendEventOutputClock(p_sys->p_input, &es->id, es->master, system_ts,
-                               ts, rate, frame_rate, frame_rate_base);
+    input_SendEventOutputClock(p_sys->p_input, &es->id, es->is_driver,
+                               system_ts, ts, rate, frame_rate, frame_rate_base);
 }
 
 static void EsOutCreateDecoder( es_out_t *out, es_out_id_t *p_es )
@@ -2166,16 +2166,16 @@ static void EsOutCreateDecoder( es_out_t *out, es_out_id_t *p_es )
 
     if( p_es->fmt.i_cat != UNKNOWN_ES
      && p_es->fmt.i_cat == p_sys->i_driver_source_cat
-     && p_es->p_pgrm->p_master_clock == NULL )
+     && p_es->p_pgrm->p_driver_clock == NULL )
     {
-        p_es->master = true;
-        p_es->p_pgrm->p_master_clock = p_es->p_clock =
+        p_es->is_driver = true;
+        p_es->p_pgrm->p_driver_clock = p_es->p_clock =
             vlc_clock_main_CreateDriver( p_es->p_pgrm->p_main_clock,
                                          &clock_cbs, p_es );
     }
     else
     {
-        p_es->master = false;
+        p_es->is_driver = false;
         p_es->p_clock = vlc_clock_main_CreateClient( p_es->p_pgrm->p_main_clock,
                                                      p_es->fmt.i_cat,
                                                      &clock_cbs, p_es );
@@ -2183,7 +2183,7 @@ static void EsOutCreateDecoder( es_out_t *out, es_out_id_t *p_es )
 
     if( !p_es->p_clock )
     {
-        p_es->master = false;
+        p_es->is_driver = false;
         return;
     }
 
@@ -2232,8 +2232,8 @@ static void EsOutDestroyDecoder( es_out_t *out, es_out_id_t *p_es )
 
     vlc_input_decoder_Delete( p_es->p_dec );
     p_es->p_dec = NULL;
-    if( p_es->p_pgrm->p_master_clock == p_es->p_clock )
-        p_es->p_pgrm->p_master_clock = NULL;
+    if( p_es->p_pgrm->p_driver_clock == p_es->p_clock )
+        p_es->p_pgrm->p_driver_clock = NULL;
     vlc_clock_Delete( p_es->p_clock );
     p_es->p_clock = NULL;
 
-- 
2.30.0