vlc | branch: master | Steve Lhomme <[email protected]> | Tue Jul 3 16:10:26 2018 +0200| [810840157d5fa47b073af87cd132a665ae8738e3] | committer: Steve Lhomme
hotkeys: the audio/subtitle time are vlc_tick_t They either get 0 or vlc_tick_now(). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=810840157d5fa47b073af87cd132a665ae8738e3 --- modules/control/hotkeys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index a5f0f7e001..4631812f58 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -58,8 +58,8 @@ struct intf_sys_t /*subtitle_delaybookmarks: placeholder for storing subtitle sync timestamps*/ struct { - int64_t i_time_subtitle; - int64_t i_time_audio; + vlc_tick_t i_time_subtitle; + vlc_tick_t i_time_audio; } subtitle_delaybookmarks; struct @@ -686,12 +686,12 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, else { vlc_tick_t i_current_subdelay = var_GetInteger( p_input, "spu-delay" ); - int64_t i_additional_subdelay = p_sys->subtitle_delaybookmarks.i_time_audio - p_sys->subtitle_delaybookmarks.i_time_subtitle; + vlc_tick_t i_additional_subdelay = p_sys->subtitle_delaybookmarks.i_time_audio - p_sys->subtitle_delaybookmarks.i_time_subtitle; vlc_tick_t i_total_subdelay = i_current_subdelay + i_additional_subdelay; var_SetInteger( p_input, "spu-delay", i_total_subdelay); ClearChannels( p_vout, slider_chan ); DisplayMessage( p_vout, _( "Sub sync: corrected %i ms (total delay = %i ms)" ), - (int)(i_additional_subdelay / 1000), + MS_FROM_VLC_TICK( i_additional_subdelay ), MS_FROM_VLC_TICK( i_total_subdelay ) ); p_sys->subtitle_delaybookmarks.i_time_audio = 0; p_sys->subtitle_delaybookmarks.i_time_subtitle = 0; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
