X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_stream.h;h=bb947c94285b469ad406f2f2241eea197e99c958;hb=de587c237065de4696d9d035d0504cdf34990d87;hp=b89ec0c527aa1a0ee2925674ad535a7905ec807e;hpb=9b6b0df36a16b1ca7706e138f6c491e12e5eecfa;p=vlc

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index b89ec0c527..bb947c9428 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -21,10 +21,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#if !defined( __LIBVLC__ )
-  #error You are not libvlc or one of its plugins. You cannot include this file
-#endif
-
 #ifndef _VLC_STREAM_H
 #define _VLC_STREAM_H 1
 
@@ -47,8 +43,8 @@ extern "C" {
 enum stream_query_e
 {
     /* capabilities */
-    STREAM_CAN_SEEK,            /**< arg1= vlc_bool_t *   res=cannot fail*/
-    STREAM_CAN_FASTSEEK,        /**< arg1= vlc_bool_t *   res=cannot fail*/
+    STREAM_CAN_SEEK,            /**< arg1= bool *   res=cannot fail*/
+    STREAM_CAN_FASTSEEK,        /**< arg1= bool *   res=cannot fail*/
 
     /* */
     STREAM_SET_POSITION,        /**< arg1= int64_t        res=can fail  */
@@ -60,12 +56,14 @@ enum stream_query_e
 
     /* 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
+    STREAM_CONTROL_ACCESS,  /* arg1= int i_access_query, args   res: can fail
                              if access unreachable or access control answer */
+
+    STREAM_GET_CONTENT_TYPE,   /**< arg1= char **         res=can file */
 };
 
 VLC_EXPORT( int, stream_Read, ( stream_t *s, void *p_read, int i_read ) );
-VLC_EXPORT( int, stream_Peek, ( stream_t *s, uint8_t **pp_peek, int i_peek ) );
+VLC_EXPORT( int, stream_Peek, ( stream_t *s, const uint8_t **pp_peek, int i_peek ) );
 VLC_EXPORT( int, stream_vaControl, ( stream_t *s, int i_query, va_list args ) );
 VLC_EXPORT( void, stream_Delete, ( stream_t *s ) );
 VLC_EXPORT( int, stream_Control, ( stream_t *s, int i_query, ... ) );
@@ -91,18 +89,30 @@ static inline int64_t stream_Size( stream_t *s )
     stream_Control( s, STREAM_GET_SIZE, &i_pos );
     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 );
 }
 
-VLC_EXPORT( char *, stream_ReadLine, ( stream_t * ) );
+/**
+ * Get the Content-Type of a stream, or NULL if unknown.
+ * Result must be free()'d.
+ */
+static inline char *stream_ContentType( stream_t *s )
+{
+    char *res;
+    if( stream_Control( s, STREAM_GET_CONTENT_TYPE, &res ) )
+        return NULL;
+    return res;
+}
 
 /**
  * Create a special stream and a demuxer, this allows chaining demuxers
@@ -114,7 +124,7 @@ VLC_EXPORT( void,      stream_DemuxDelete,( stream_t *s ) );
 
 
 #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, vlc_bool_t i_preserve_memory ) );
+VLC_EXPORT( stream_t *,__stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, int64_t i_size, bool i_preserve_memory ) );
 #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 ) );
 
@@ -131,7 +141,7 @@ VLC_EXPORT( stream_t *,__stream_UrlNew, (vlc_object_t *p_this, const char *psz_u
    /* Maybe we should make VLC_OBJECT a simple cast noawadays... */
 struct stream_t
 {
-	VLC_COMMON_MEMBERS
+    VLC_COMMON_MEMBERS
 };
 # endif