Removed broken ES_OUT_GET_TS.

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index e13c9ca4c184b5e29039ba71fe2dcfd08c762a41..c718411c3afad9c98679ff3bea459471aecdbd95 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -68,10 +68,6 @@ enum es_out_query_e
     ES_OUT_SET_GROUP_PCR,       /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
     ES_OUT_RESET_PCR,           /* no arg */
 
-    /* Timestamp handling, convert an input timestamp to a global clock one.
-     * (shouldn't have to be used by input plugins directly) */
-    ES_OUT_GET_TS,             /* arg1=int64_t i_ts(microsecond!) (using default group 0), arg2=int64_t* converted i_ts */
-
     /* Try not to use this one as it is a bit hacky */
     ES_OUT_SET_ES_FMT,         /* arg1= es_out_id_t* arg2=es_format_t* */
 

diff --git a/src/input/es_out.c b/src/input/es_out.c
index ec1612bf7f64848742e5250830db1bab09374569..fc9e64b2fb23cb6a8a7417d5a3e02f4b6f5fd810 100644 (file)
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2194,17 +2194,6 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
             EsOutChangePosition( out );
             return VLC_SUCCESS;
 
-        case ES_OUT_GET_TS:
-            if( p_sys->p_pgrm )
-            {
-                int64_t i_ts = (int64_t)va_arg( args, int64_t );
-                int64_t *pi_ts = (int64_t *)va_arg( args, int64_t * );
-                *pi_ts = input_clock_GetTS( p_sys->p_pgrm->p_clock, NULL,
-                                            p_sys->p_input->i_pts_delay, i_ts );
-                return VLC_SUCCESS;
-            }
-            return VLC_EGENERIC;
-
         case ES_OUT_SET_GROUP:
         {
             int j;

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 15809c1ed9e19befe44bbe45d3f5670b114bdafd..a1de481d51c02c8c3861d3f00069f5a77a94f71f 100644 (file)
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -582,10 +582,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
         assert(0);
         return VLC_EGENERIC;
 
-    /* TODO ? or to remove ? */
-    case ES_OUT_GET_TS:
-        return VLC_EGENERIC;
-
     /* Pass-through control */
     case ES_OUT_SET_ACTIVE:
     case ES_OUT_SET_MODE: