[vlc-devel] [PATCH 1/2] clock: remove unused vlc_clock_main_SetMaster()

Thomas Guillem thomas at gllm.fr
Fri Sep 18 15:02:11 CEST 2020


The es_out is never changing the clock type for now. If it is needed in
the future, delete() + new() could be a good solution.
---
 src/clock/clock.c | 14 --------------
 src/clock/clock.h |  6 ------
 2 files changed, 20 deletions(-)

diff --git a/src/clock/clock.c b/src/clock/clock.c
index f5c0583e84b..3001d76514c 100644
--- a/src/clock/clock.c
+++ b/src/clock/clock.c
@@ -619,20 +619,6 @@ vlc_clock_t *vlc_clock_CreateSlave(const vlc_clock_t *clock,
     return vlc_clock_main_CreateSlave(clock->owner, cat, NULL, NULL);
 }
 
-void vlc_clock_main_SetMaster(vlc_clock_main_t *main_clock, vlc_clock_t *clock)
-{
-    vlc_mutex_lock(&main_clock->lock);
-    if (main_clock->master != NULL)
-    {
-        vlc_clock_master_reset(main_clock->master);
-        vlc_clock_set_slave_callbacks(main_clock->master);
-    }
-    vlc_clock_set_master_callbacks(clock);
-    main_clock->master = clock;
-    vlc_mutex_unlock(&main_clock->lock);
-}
-
-
 void vlc_clock_Delete(vlc_clock_t *clock)
 {
     vlc_clock_main_t *main_clock = clock->owner;
diff --git a/src/clock/clock.h b/src/clock/clock.h
index 948aa59d671..ec4c1ac9859 100644
--- a/src/clock/clock.h
+++ b/src/clock/clock.h
@@ -93,12 +93,6 @@ void vlc_clock_main_SetDejitter(vlc_clock_main_t *main_clock, vlc_tick_t dejitte
 void vlc_clock_main_ChangePause(vlc_clock_main_t *clock, vlc_tick_t system_now,
                                 bool paused);
 
-/**
- * This function set the allocated interface as the master making the current
- * master if any a slave.
- */
-void vlc_clock_main_SetMaster(vlc_clock_main_t *main_clock, vlc_clock_t *clock);
-
 /**
  * This function creates a new master vlc_clock_t interface
  *
-- 
2.28.0



More information about the vlc-devel mailing list