vlc | branch: master | Thomas Guillem <[email protected]> | Fri Sep 18 14:54:37 2020 +0200| [7f1c214efffa9321cf43dc792468fbe206ca13b8] | committer: Thomas Guillem
clock: remove unused vlc_clock_main_SetMaster() 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7f1c214efffa9321cf43dc792468fbe206ca13b8 --- 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 f5c0583e84..3001d76514 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 948aa59d67..ec4c1ac985 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 * _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
