Remove unused VLC_EBADOBJ

[vlc] / include / vlc_es_out.h

diff --git a/include/vlc_es_out.h b/include/vlc_es_out.h
index 5af2b77fc8bf6ad4957f30ae08fe8379059e73b9..06728092d6222508a29eacdc350ee756a6be6b72 100644 (file)
--- a/include/vlc_es_out.h
+++ b/include/vlc_es_out.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
- * vlc_es_out.h
+ * vlc_es_out.h: es_out (demuxer output) descriptor, queries and methods
  *****************************************************************************
- * Copyright (C) 1999-2004 VideoLAN
+ * Copyright (C) 1999-2004 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef _VLC_ES_OUT_H
@@ -40,9 +40,9 @@ enum es_out_mode_e
 enum es_out_query_e
 {
     /* activate apply of mode */
-    ES_OUT_SET_ACTIVE,  /* arg1= vlc_bool_t                     */
+    ES_OUT_SET_ACTIVE,  /* arg1= bool                     */
     /* see if mode is currently aplied or not */
-    ES_OUT_GET_ACTIVE,  /* arg1= vlc_bool_t*                    */
+    ES_OUT_GET_ACTIVE,  /* arg1= bool*                    */
 
     /* set/get mode */
     ES_OUT_SET_MODE,    /* arg1= int                            */
@@ -51,9 +51,12 @@ enum es_out_query_e
     /* set es selected for the es category(audio/video/spu) */
     ES_OUT_SET_ES,      /* arg1= es_out_id_t*                   */
 
+    /* set 'default' tag on es (copied across from container) */
+    ES_OUT_SET_DEFAULT, /* arg1= es_out_id_t*                   */
+
     /* force selection/unselection of the ES (bypass current mode)*/
-    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t   */
-    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=vlc_bool_t*  */
+    ES_OUT_SET_ES_STATE,/* arg1= es_out_id_t* arg2=bool   */
+    ES_OUT_GET_ES_STATE,/* arg1= es_out_id_t* arg2=bool*  */
 
     /* */
     ES_OUT_SET_GROUP,   /* arg1= int                            */
@@ -78,6 +81,12 @@ enum es_out_query_e
 
     /* Allow preroll of data (data with dts/pts < i_pts for one ES will be decoded but not displayed */
     ES_OUT_SET_NEXT_DISPLAY_TIME,   /* arg1=es_out_id_t* arg2=int64_t i_pts(microsecond) */
+    /* Set meta data for group (dynamic) */
+    ES_OUT_SET_GROUP_META,  /* arg1=int i_group arg2=vlc_meta_t */
+    /* Set epg for group (dynamic) */
+    ES_OUT_SET_GROUP_EPG,   /* arg1=int i_group arg2=vlc_epg_t */
+    /* */
+    ES_OUT_DEL_GROUP        /* arg1=int i_group */
 };
 
 struct es_out_t
@@ -86,6 +95,7 @@ struct es_out_t
     int          (*pf_send)   ( es_out_t *, es_out_id_t *, block_t * );
     void         (*pf_del)    ( es_out_t *, es_out_id_t * );
     int          (*pf_control)( es_out_t *, int i_query, va_list );
+    bool      b_sout;
 
     es_out_sys_t    *p_sys;
 };