use empty .gitignore files to track empty folders

[vlc] / include / vlc_stream.h

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 81f0f50c772c2b9bc245893688e4a3c6bd693aec..34fcace598d1848f041d2cfceba922d0b2ee4756 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -60,12 +60,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,17 +93,31 @@ 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 );
 }
 
+/**
+ * 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
  */
@@ -129,7 +145,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