X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_stream.h;h=e5cd0e0130b1702455042323b449b69204023763;hb=dd7fc9b0e33ed8ea30a7026e765c4624cfee73d9;hp=06f28bfe51f156b044e68bc0b306bd187a4e8d58;hpb=2b3f7c579b85f0258f3d55bbf52ffc3d9faa6603;p=vlc

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 06f28bfe51..e5cd0e0130 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -53,17 +53,21 @@ struct stream_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Module properties */
+    /* Module properties for stream filter */
     module_t    *p_module;
 
-    /* For stream filter they will hold an array of stream sources */
-    int      i_source;
-    stream_t **pp_source;
+    /* Real or virtual path (it can only be changed during stream_t opening) */
+    char        *psz_path;
+
+    /* Stream source for stream filter */
+    stream_t *p_source;
 
     /* */
     int      (*pf_read)   ( stream_t *, void *p_read, unsigned int i_read );
     int      (*pf_peek)   ( stream_t *, const uint8_t **pp_peek, unsigned int i_peek );
     int      (*pf_control)( stream_t *, int i_query, va_list );
+
+    /* */
     void     (*pf_destroy)( stream_t *);
 
     /* Private data for module */
@@ -88,17 +92,19 @@ 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)*/
-
     /* Special for direct access control from demuxer.
      * XXX: avoid using it by all means */
     STREAM_CONTROL_ACCESS,  /* arg1= int i_access_query, args   res: can fail
                              if access unreachable or access control answer */
 
+    /* You should update size of source if any and then update size 
+     * FIXME find a way to avoid it */
+    STREAM_UPDATE_SIZE,
+
+    /* */
     STREAM_GET_CONTENT_TYPE,    /**< arg1= char **         res=can fail */
 
-    /* SET_RECORD:
-     * XXX only data read through stream_Read/Block will be recorded */
+    /* XXX only data read through stream_Read/Block will be recorded */
     STREAM_SET_RECORD_STATE,     /**< arg1=bool, arg2=const char *psz_ext (if arg1 is true)  res=can fail */
 };
 
@@ -130,13 +136,6 @@ static inline int64_t stream_Size( stream_t *s )
     return i_pos;
 }
 
-static inline int stream_MTU( stream_t *s )
-{
-    int i_mtu;
-    stream_Control( s, STREAM_GET_MTU, &i_mtu );
-    return i_mtu;
-}
-
 static inline int stream_Seek( stream_t *s, int64_t i_pos )
 {
     return stream_Control( s, STREAM_SET_POSITION, i_pos );
@@ -156,14 +155,26 @@ static inline char *stream_ContentType( stream_t *s )
 
 /**
  * Create a special stream and a demuxer, this allows chaining demuxers
+ * You must delete it using stream_Delete.
  */
 #define stream_DemuxNew( a, b, c ) __stream_DemuxNew( VLC_OBJECT(a), b, c)
 VLC_EXPORT( stream_t *,__stream_DemuxNew, ( vlc_object_t *p_obj, const char *psz_demux, es_out_t *out ) );
+/**
+ * Send data to a stream_t handle created by stream_DemuxNew.
+ */
 VLC_EXPORT( void,      stream_DemuxSend,  ( stream_t *s, block_t *p_block ) );
-VLC_EXPORT( void,      stream_DemuxDelete,( stream_t *s ) );
 
+/**
+ * Create a stream_t reading from memory.
+ * You must delete it using stream_Delete.
+ */
 #define stream_MemoryNew( a, b, c, d ) __stream_MemoryNew( VLC_OBJECT(a), b, c, d )
-VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, bool i_preserve_memory ) );
+VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, bool b_preserve_memory ) );
+
+/**
+ * Create a stream_t reading from an URL.
+ * You must delete it using stream_Delete.
+ */
 #define stream_UrlNew( a, b ) __stream_UrlNew( VLC_OBJECT(a), b )
 VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) );