Test pointers against NULL instead of 0.

[vlc] / include / vlc_es_out.h

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 5b255ad7378ac08d5d972c98b5809157740fab8e..c718411c3afad9c98679ff3bea459471aecdbd95 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -44,15 +44,6 @@ enum es_out_mode_e
 
 enum es_out_query_e
 {
-    /* activate application of mode */
-    ES_OUT_SET_ACTIVE,  /* arg1= bool                     */
-    /* see if mode is currently aplied or not */
-    ES_OUT_GET_ACTIVE,  /* arg1= bool*                    */
-
-    /* set/get mode */
-    ES_OUT_SET_MODE,    /* arg1= int                            */
-    ES_OUT_GET_MODE,    /* arg2= int*                           */
-
     /* set ES selected for the es category (audio/video/spu) */
     ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
     ES_OUT_RESTART_ES,  /* arg1= es_out_id_t*                   */
@@ -66,7 +57,6 @@ enum es_out_query_e
 
     /* */
     ES_OUT_SET_GROUP,   /* arg1= int                            */
-    ES_OUT_GET_GROUP,   /* arg1= int*                           */
 
     /* PCR handling, DTS/PTS will be automatically computed using thoses PCR
      * XXX: SET_PCR(_GROUP) are in charge of the pace control. They will wait
@@ -78,12 +68,8 @@ 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_FMT,     /* arg1= es_out_id_t* arg2=es_format_t* */
+    ES_OUT_SET_ES_FMT,         /* arg1= es_out_id_t* arg2=es_format_t* */
 
     /* Allow preroll of data (data with dts/pts < i_pts for all ES will be decoded but not displayed */
     ES_OUT_SET_NEXT_DISPLAY_TIME,   /* arg1=int64_t i_pts(microsecond) */