Changeset e3e9c13799fc03656fe36f9646b77030aff2626c

Timestamp:

02/10/07 18:05:13 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1191341113 +0000

git-parent:

[d8fc0a94ed76c7f4d9e441b28010d997ab9890eb]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1191341113 +0000

Message:

Pass content-type from access to stream

Files:

• include/vlc_stream.h (modified) (3 diffs)
• src/input/demux.c (modified) (1 diff)
• src/input/mem_stream.c (modified) (1 diff)
• src/input/stream.c (modified) (1 diff)

include/vlc_stream.h

@@ -61 +61 @@
-    /* Special for direct access control from demuxer.
-     * XXX: avoid using it by all means */
- 
+,
-                             if access unreachable or access control answer */
+
+    STREAM_GET_CONTENT_TYPE,   /**< arg1= char **         res=can file */
-};
-
@@ -92 +94 @@
-    return i_pos;
-}
+
-static inline int stream_MTU( stream_t *s )
-{
@@ -98 +101 @@
-    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;
-}
-

src/input/demux.c

@@ -509 +509 @@
-
-        case STREAM_CONTROL_ACCESS:
+        case STREAM_GET_CONTENT_TYPE:
-            return VLC_EGENERIC;
-

src/input/mem_stream.c

@@ -124 +124 @@
-
-        case STREAM_GET_MTU:
+        case STREAM_GET_CONTENT_TYPE:
-            return VLC_EGENERIC;
-

src/input/stream.c

@@ -556 +556 @@
-            }
-            return access2_vaControl( p_access, i_int, args );
+
+        case STREAM_GET_CONTENT_TYPE:
+            return access2_Control( p_access, ACCESS_GET_CONTENT_TYPE,
+                                    va_arg( args, char ** ) );
-
-        default: