* src/input/control.c: added INPUT_ADD_INFO/INPUT_SET_NAME to input_Control().

[vlc] / include / ninput.h

diff --git a/include/ninput.h b/include/ninput.h
index 3344d99cda5c986fcfd9283ae73156147e2af26e..d64fb730ac628d9fdd85f9bdddedba4357ad9cee 100644 (file)
--- a/include/ninput.h
+++ b/include/ninput.h
@@ -2,7 +2,7 @@
  * ninput.h
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ninput.h,v 1.27 2004/01/31 05:24:55 fenrir Exp $
+ * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -54,7 +54,7 @@ enum es_out_query_e
     /* XXX XXX XXX Don't use them YET !!! */
     ES_OUT_SET_PCR,             /* arg1=int64_t i_pcr(microsecond!) (using default group 0)*/
     ES_OUT_SET_GROUP_PCR,       /* arg1= int i_group, arg2=int64_t i_pcr(microsecond!)*/
-    ES_OUT_RESET_PCR,   /* no arg */
+    ES_OUT_RESET_PCR    /* no arg */
 };
 
 struct es_out_t
@@ -118,7 +118,7 @@ enum stream_query_e
 
     STREAM_GET_SIZE,            /**< arg1= int64_t *      res=cannot fail (0 if no sense)*/
 
-    STREAM_GET_MTU,             /**< arg1= int *          res=cannot fail (0 if no sense)*/
+    STREAM_GET_MTU              /**< arg1= int *          res=cannot fail (0 if no sense)*/
 };
 
 /**
@@ -133,7 +133,7 @@ struct stream_t
     int      (*pf_peek)   ( stream_t *, uint8_t **pp_peek, int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
 
-    stream_sys_t    *p_sys;
+    stream_sys_t *p_sys;
 };
 
 /**
@@ -236,6 +236,14 @@ static inline block_t *stream_Block( stream_t *s, int i_size )
 
 VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) );
 
+/**
+ * Create a special stream and a demuxer, this allows chaining demuxers
+ */
+#define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c)
+VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, char *psz_demux, es_out_t *out ) );
+VLC_EXPORT( void,      stream_DemuxSend,  ( stream_t *s, block_t *p_block ) );
+VLC_EXPORT( void,      stream_DemuxDelete,( stream_t *s ) );
+
 /**
  * @}
  */
@@ -283,13 +291,42 @@ enum demux_query_e
     DEMUX_GET_META              /* arg1= vlc_meta_t **  res=can fail    */
 };
 
+struct seekpoint_t
+{
+    int64_t i_byte_offset;
+    int64_t i_time_offset;
+    char    *psz_name;
+};
+
+static inline seekpoint_t *vlc_seekpoint_New( void )
+{
+    seekpoint_t *point = (seekpoint_t*)malloc( sizeof( seekpoint_t ) );
+    point->i_byte_offset = point->i_time_offset;
+    point->psz_name = NULL;
+    return point;
+}
+
+static inline void vlc_seekpoint_Delete( seekpoint_t *point )
+{
+    if( !point ) return;
+    if( point->psz_name ) free( point->psz_name );
+    free( point );
+}
 
+static inline seekpoint_t *vlc_seekpoint_Duplicate( seekpoint_t *src )
+{
+    seekpoint_t *point = vlc_seekpoint_New();
+    if( src->psz_name ) point->psz_name = strdup( src->psz_name );
+    point->i_time_offset = src->i_time_offset;
+    point->i_byte_offset = src->i_byte_offset;
+    return point;
+}
 
 /* Demux */
-VLC_EXPORT( int,            demux_vaControl,        ( input_thread_t *, int i_query, va_list  ) );
-VLC_EXPORT( int,            demux_Control,          ( input_thread_t *, int i_query, ...  ) );
+VLC_EXPORT( int, demux_vaControl,        ( input_thread_t *, int i_query, va_list  ) );
+VLC_EXPORT( int, demux_Control,          ( input_thread_t *, int i_query, ...  ) );
 
-VLC_EXPORT( int,            demux_vaControlDefault, ( input_thread_t *, int i_query, va_list  ) );
+VLC_EXPORT( int, demux_vaControlDefault, ( input_thread_t *, int i_query, va_list  ) );
 
 
 /* New demux arch: don't touch that */
@@ -297,6 +334,7 @@ VLC_EXPORT( int,            demux_vaControlDefault, ( input_thread_t *, int i_qu
 #define demux2_New( a, b, c, d ) __demux2_New(VLC_OBJECT(a), b, c, d)
 VLC_EXPORT( demux_t *, __demux2_New,  ( vlc_object_t *p_obj, char *psz_mrl, stream_t *s, es_out_t *out ) );
 VLC_EXPORT( void,      demux2_Delete, ( demux_t * ) );
+VLC_EXPORT( int,       demux2_vaControlHelper, ( stream_t *, int64_t i_start, int64_t i_end, int i_bitrate, int i_align, int i_query, va_list args ) );
 
 static inline int demux2_Demux( demux_t *p_demux )
 {
@@ -317,13 +355,54 @@ static inline int demux2_Control( demux_t *p_demux, int i_query, ... )
     return i_result;
 }
 
-
 /* Subtitles */
-VLC_EXPORT( char **,        subtitles_Detect,       ( input_thread_t *, char* path, char *fname ) );
+VLC_EXPORT( char **, subtitles_Detect, ( input_thread_t *, char* path, char *fname ) );
 
 /**
  * @}
  */
 
-#endif
 
+/**
+ * \defgroup input Input
+ * @{
+ */
+enum input_query_e
+{
+    INPUT_GET_POSITION,         /* arg1= double *       res=    */
+    INPUT_SET_POSITION,         /* arg1= double         res=can fail    */
+
+    INPUT_GET_TIME,             /* arg1= int64_t *      res=    */
+    INPUT_SET_TIME,             /* arg1= int64_t        res=can fail    */
+
+    INPUT_GET_LENGTH,           /* arg1= int64_t *      res=can fail    */
+
+    INPUT_GET_FPS,              /* arg1= float *        res=can fail    */
+    INPUT_GET_META,             /* arg1= vlc_meta_t **  res=can fail    */
+
+    INPUT_GET_BOOKMARKS,   /* arg1= seekpoint_t *** arg2= int * res=can fail */
+    INPUT_CLEAR_BOOKMARKS, /* res=can fail */
+    INPUT_ADD_BOOKMARK,    /* arg1= seekpoint_t *  res=can fail   */
+    INPUT_DEL_BOOKMARK,    /* arg1= seekpoint_t *  res=can fail   */
+    INPUT_SET_BOOKMARK,    /* arg1= int  res=can fail    */
+
+    INPUT_ADD_OPTION, /* arg1= char * arg2= char *  res=can fail    */
+
+    INPUT_ADD_INFO,   /* arg1= char * arg2= char * arg3=...  res=can fail    */
+
+    INPUT_SET_NAME,   /* arg1= char * res=can fail    */
+
+    INPUT_GET_SUBDELAY,    /* arg1 = int* res=can fail */
+    INPUT_SET_SUBDELAY,    /* arg1 = int  res=can fail */
+
+    INPUT_GET_DIVISIONS
+};
+
+VLC_EXPORT( int, input_vaControl,( input_thread_t *, int i_query, va_list  ) );
+VLC_EXPORT( int, input_Control,  ( input_thread_t *, int i_query, ...  ) );
+
+/**
+ * @}
+ */
+
+#endif