* include/vlc_config.h: removed unused config stuff.

[vlc] / include / input_ext-intf.h

diff --git a/include/input_ext-intf.h b/include/input_ext-intf.h
index de934aabb33f88c99dd65977851522ea4e0b6800..578dc300be74c3d45640e9ab828a6486b408aaf3 100644 (file)
--- a/include/input_ext-intf.h
+++ b/include/input_ext-intf.h
@@ -4,7 +4,7 @@
  * control the pace of reading.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-intf.h,v 1.81 2002/12/12 15:10:58 gbazin Exp $
+ * $Id: input_ext-intf.h,v 1.93 2003/08/02 15:22:07 fenrir Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -33,6 +33,7 @@
 #define REQUESTED_MPEG         1
 #define REQUESTED_A52          2
 #define REQUESTED_LPCM         3
+#define REQUESTED_DTS          4
 #define REQUESTED_NOAUDIO    255
 
 #define OFFSETTOTIME_MAX_SIZE       10
@@ -51,7 +52,7 @@ struct es_descriptor_t
     uint8_t                 i_cat;    /* stream category (audio, video, spu) */
     int                     i_demux_fd;   /* used to store demux device
                                              file handle */
-    char                    psz_desc[20]; /* description of ES: audio language
+    char                    *psz_desc;    /* description of ES: audio language
                                            * for instance ; NULL if not
                                            *  available */
 
@@ -65,9 +66,14 @@ struct es_descriptor_t
 
     /* Decoder information */
     decoder_fifo_t *        p_decoder_fifo;
+    void *                  p_waveformatex;
+    void *                  p_bitmapinfoheader;
 
     count_t                 c_packets;                 /* total packets read */
     count_t                 c_invalid_packets;       /* invalid packets read */
+
+    /* XXX hack: to force a decoder instead of mode based on sout */
+    vlc_bool_t              b_force_decoder;
 };
 
 /* Special PID values - note that the PID is only on 13 bits, and that values
@@ -106,7 +112,7 @@ struct pgrm_descriptor_t
     mtime_t                 cr_ref, sysdate_ref;
     mtime_t                 last_cr; /* reference to detect unexpected stream
                                       * discontinuities                      */
-    mtime_t                 last_syscr;
+    mtime_t                 last_pts;
     count_t                 c_average_count;
                            /* counter used to compute dynamic average values */
     int                     i_synchro_state;
@@ -313,6 +319,7 @@ struct input_thread_t
     int           (* pf_rewind ) ( input_thread_t * );
                                            /* NULL if we don't support going *
                                             * backwards (it's gonna be fun)  */
+    int           (* pf_demux_control ) ( input_thread_t *, int, va_list );
     demux_sys_t *    p_demux_data;                      /* data of the demux */
 
     /* Buffer manager */
@@ -327,6 +334,7 @@ struct input_thread_t
 
     /* Playlist item */
     char *  psz_source;
+    char *  psz_dupsource;
     char *  psz_access;
     char *  psz_demux;
     char *  psz_name;
@@ -342,6 +350,7 @@ struct input_thread_t
 #define INPUT_METHOD_DISC        0x20   /* stream is read directly from disc */
 #define INPUT_METHOD_DVD         0x21             /* stream is read from DVD */
 #define INPUT_METHOD_VCD         0x22             /* stream is read from VCD */
+#define INPUT_METHOD_CDDA        0x23            /* stream is read from CDDA */
 #define INPUT_METHOD_NETWORK     0x30         /* stream is read from network */
 #define INPUT_METHOD_UCAST       0x31                         /* UDP unicast */
 #define INPUT_METHOD_MCAST       0x32                       /* UDP multicast */
@@ -349,6 +358,7 @@ struct input_thread_t
 #define INPUT_METHOD_VLAN_BCAST  0x34            /* UDP broadcast with VLANs */
 #define INPUT_METHOD_SATELLITE   0x40               /* stream is read from a */
                                                            /* satellite card */
+#define INPUT_METHOD_SLP         0x50                          /* SLP stream */
 
 /* Status changing methods */
 #define INPUT_STATUS_END            0
@@ -376,6 +386,9 @@ void   input_DestroyThread  ( input_thread_t * );
 #define input_SetStatus(a,b) __input_SetStatus(VLC_OBJECT(a),b)
 VLC_EXPORT( void, __input_SetStatus, ( vlc_object_t *, int ) );
 
+#define input_SetRate(a,b) __input_SetRate(VLC_OBJECT(a),b)
+VLC_EXPORT( void, __input_SetRate, ( vlc_object_t *, int ) );
+
 #define input_Seek(a,b,c) __input_Seek(VLC_OBJECT(a),b,c)
 VLC_EXPORT( void, __input_Seek, ( vlc_object_t *, off_t, int ) );