* all: removed decoder_fifo_t.

[vlc] / include / ninput.h

diff --git a/include/ninput.h b/include/ninput.h
index f9701f1f583563690526138a3f3872d6866233c2..942b8fd8ff1c8022b031c7ed069903bcbf3aaf53 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.7 2003/08/23 14:15:27 fenrir Exp $
+ * $Id: ninput.h,v 1.18 2003/11/21 00:38:01 gbazin Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -24,6 +24,58 @@
 #ifndef _NINPUT_H
 #define _NINPUT_H 1
 
+#include "vlc_es.h"
+
+enum es_out_query_e
+{
+    ES_OUT_SET_SELECT,  /* arg1= es_out_id_t* arg2=vlc_bool_t   */
+    ES_OUT_GET_SELECT   /* arg1= es_out_id_t* arg2=vlc_bool_t*  */
+};
+
+struct es_out_t
+{
+    es_out_id_t *(*pf_add)    ( es_out_t *, es_format_t * );
+    int          (*pf_send)   ( es_out_t *, es_out_id_t *, block_t * );
+    int          (*pf_send_pes)( es_out_t *, es_out_id_t *, pes_packet_t * );
+    void         (*pf_del)    ( es_out_t *, es_out_id_t * );
+    int          (*pf_control)( es_out_t *, int i_query, va_list );
+
+    es_out_sys_t    *p_sys;
+};
+
+static inline es_out_id_t * es_out_Add( es_out_t *out, es_format_t *fmt )
+{
+    return out->pf_add( out, fmt );
+}
+static inline void es_out_Del( es_out_t *out, es_out_id_t *id )
+{
+    out->pf_del( out, id );
+}
+static inline int es_out_Send( es_out_t *out, es_out_id_t *id,
+                              block_t *p_block )
+{
+    return out->pf_send( out, id, p_block );
+}
+static inline int es_out_SendPES( es_out_t *out, es_out_id_t *id,
+                                  pes_packet_t *p_pes )
+{
+    return out->pf_send_pes( out, id, p_pes );
+}
+static inline int es_out_vaControl( es_out_t *out, int i_query, va_list args )
+{
+    return out->pf_control( out, i_query, args );
+}
+static inline int es_out_Control( es_out_t *out, int i_query, ... )
+{
+    va_list args;
+    int     i_result;
+
+    va_start( args, i_query );
+    i_result = es_out_vaControl( out, i_query, args );
+    va_end( args );
+    return i_result;
+}
+
 /**
  * \defgroup stream Stream
  *
@@ -56,6 +108,7 @@ VLC_EXPORT( int,            stream_Read,            ( stream_t *, void *p_read,
 VLC_EXPORT( int,            stream_Peek,            ( stream_t *, uint8_t **pp_peek, int i_peek ) );
 VLC_EXPORT( data_packet_t *,stream_DataPacket,      ( stream_t *, int i_size, vlc_bool_t b_force ) );
 VLC_EXPORT( pes_packet_t *, stream_PesPacket,       ( stream_t *, int i_size ) );
+VLC_EXPORT( block_t *,      stream_Block,           ( stream_t *, int i_size ) );
 
 static int64_t inline stream_Tell( stream_t *s )
 {
@@ -83,19 +136,19 @@ static int inline stream_Seek( stream_t *s, int64_t i_pos )
 
 /**
  * \defgroup demux Demux
- * XXX: don't look at it yet.
  * @{
  */
-#define DEMUX_POSITION_MAX  10000
 enum demux_query_e
 {
-    DEMUX_GET_POSITION,         /* arg1= int64_t *      res=    */
-    DEMUX_SET_POSITION,         /* arg1= int64_t        res=can fail    */
+    DEMUX_GET_POSITION,         /* arg1= double *       res=    */
+    DEMUX_SET_POSITION,         /* arg1= double         res=can fail    */
 
     DEMUX_GET_TIME,             /* arg1= int64_t *      res=    */
     DEMUX_SET_TIME,             /* arg1= int64_t        res=can fail    */
 
-    DEMUX_GET_LENGTH            /* arg1= int64_t *      res=can fail    */
+    DEMUX_GET_LENGTH,           /* arg1= int64_t *      res=can fail    */
+
+    DEMUX_GET_FPS               /* arg1= float *        res=can fail    */
 };
 
 
@@ -104,8 +157,14 @@ enum demux_query_e
 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  ) );
+
+/* Subtitles */
+VLC_EXPORT( char **,        subtitles_Detect,       ( input_thread_t *, char* path, char *fname ) );
+
 /**
  * @}
  */
+
 #endif