Use VLC object for meta writer and factor code

[vlc] / include / vlc_stream.h

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index b7f989dbcca78e67ecf6e5c78253d44801b9be6c..96a2f0e5f7f0da092216976f15a408ae725856ef 100644 (file)
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -56,6 +56,9 @@ struct stream_t
     /* Module properties for stream filter */
     module_t    *p_module;
 
+    /* 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;
 
@@ -72,6 +75,9 @@ struct stream_t
 
     /* Text reader state */
     stream_text_t *p_text;
+
+    /* Weak link to parent input */
+    input_thread_t *p_input;
 };
 
 /**
@@ -154,8 +160,8 @@ 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 ) );
+VLC_EXPORT( stream_t *, stream_DemuxNew, ( demux_t *p_demux, const char *psz_demux, es_out_t *out ) );
+    
 /**
  * Send data to a stream_t handle created by stream_DemuxNew.
  */