utf8_* -> vlc_* (sed roxxors)

[vlc] / src / input / es_out.h

diff --git a/src/input/es_out.h b/src/input/es_out.h
index 9dd5d45ab3c3e070eedc6b2d474904c6d524ac97..4fb3026b0c711ee1e5e66cfefbc0f7da6f6402b5 100644 (file)
--- a/src/input/es_out.h
+++ b/src/input/es_out.h
@@ -36,17 +36,14 @@ enum es_out_mode_e
     ES_OUT_MODE_NONE,   /* don't select anything */
     ES_OUT_MODE_ALL,    /* eg for stream output */
     ES_OUT_MODE_AUTO,   /* best audio/video or for input follow audio-track, sub-track */
-    ES_OUT_MODE_PARTIAL /* select programs given after --programs */
+    ES_OUT_MODE_PARTIAL,/* select programs given after --programs */
+    ES_OUT_MODE_END     /* mark the es_out as dead */
 };
 
 enum es_out_query_private_e
 {
-
-    /* activate application of mode */
-    ES_OUT_SET_ACTIVE = ES_OUT_PRIVATE_START,       /* arg1= bool                     */
-
     /* set/get mode */
-    ES_OUT_SET_MODE,                                /* arg1= int                            */
+    ES_OUT_SET_MODE = ES_OUT_PRIVATE_START,         /* arg1= int                            */
 
     /* Get date to wait before demuxing more data */
     ES_OUT_GET_WAKE_UP,                             /* arg1=mtime_t*            res=cannot fail */
@@ -55,6 +52,7 @@ enum es_out_query_private_e
     ES_OUT_SET_ES_BY_ID,
     ES_OUT_RESTART_ES_BY_ID,
     ES_OUT_SET_ES_DEFAULT_BY_ID,
+    ES_OUT_GET_ES_OBJECTS_BY_ID,                    /* arg1=int id, vlc_object_t **dec, vout_thread_t **, aout_instance_t ** res=can fail*/
 
     /* Get buffering state */
     ES_OUT_GET_BUFFERING,                           /* arg1=bool*               res=cannot fail */
@@ -84,6 +82,11 @@ enum es_out_query_private_e
     ES_OUT_SET_JITTER,                              /* arg1=mtime_t i_pts_delay arg2=int i_cr_average res=cannot fail */
 };
 
+static inline void es_out_SetMode( es_out_t *p_out, int i_mode )
+{
+    int i_ret = es_out_Control( p_out, ES_OUT_SET_MODE, i_mode );
+    assert( !i_ret );
+}
 static inline mtime_t es_out_GetWakeup( es_out_t *p_out )
 {
     mtime_t i_wu;
@@ -142,6 +145,11 @@ static inline void es_out_SetJitter( es_out_t *p_out, mtime_t i_pts_delay, int i
     int i_ret = es_out_Control( p_out, ES_OUT_SET_JITTER, i_pts_delay, i_cr_average );
     assert( !i_ret );
 }
+static inline int es_out_GetEsObjects( es_out_t *p_out, int i_id,
+                                       vlc_object_t **pp_decoder, vout_thread_t **pp_vout, aout_instance_t **pp_aout )
+{
+    return es_out_Control( p_out, ES_OUT_GET_ES_OBJECTS_BY_ID, i_id, pp_decoder, pp_vout, pp_aout );
+}
 
 es_out_t  *input_EsOutNew( input_thread_t *, int i_rate );