vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Jun 4 19:13:44 2017 +0300| [0521d5aedda9e016bfe6d646c560c4dd02a6407a] | committer: Rémi Denis-Courmont
timeshift: simplify simple pass-through controls > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0521d5aedda9e016bfe6d646c560c4dd02a6407a --- src/input/es_out_timeshift.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c index c4d1820181..b23ae7c9a5 100644 --- a/src/input/es_out_timeshift.c +++ b/src/input/es_out_timeshift.c @@ -717,15 +717,14 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) { return ControlLockedSetFrameNext( p_out ); } + case ES_OUT_GET_PCR_SYSTEM: - { if( p_sys->b_delayed ) return VLC_EGENERIC; + /* fall through */ + case ES_OUT_GET_GROUP_FORCED: + return es_out_vaControl( p_sys->p_out, i_query, args ); - mtime_t *pi_system = (mtime_t*)va_arg( args, mtime_t * ); - mtime_t *pi_delay = (mtime_t*)va_arg( args, mtime_t * ); - return es_out_ControlGetPcrSystem( p_sys->p_out, pi_system, pi_delay ); - } case ES_OUT_MODIFY_PCR_SYSTEM: { const bool b_absolute = va_arg( args, int ); @@ -736,11 +735,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args ) return es_out_ControlModifyPcrSystem( p_sys->p_out, b_absolute, i_system ); } - case ES_OUT_GET_GROUP_FORCED: - { - int *pi_group = va_arg( args, int * ); - return es_out_Control( p_sys->p_out, ES_OUT_GET_GROUP_FORCED, pi_group ); - } default: msg_Err( p_sys->p_input, "Unknown es_out_Control query !" ); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
