X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_stream.h;h=1d499890c3f69355966afccc066f5bbd74065d30;hb=c75fafe4ec348154a6e07c324dbe62c1c23a7149;hp=35cfb35c58ca23812a2046daf90fb16b4d1b24ab;hpb=a463d9bd0e7fcb7dcc600a26682f98e55df5d303;p=vlc diff --git a/include/vlc_stream.h b/include/vlc_stream.h index 35cfb35c58..1d499890c3 100644 --- a/include/vlc_stream.h +++ b/include/vlc_stream.h @@ -52,6 +52,7 @@ typedef struct stream_text_t stream_text_t; struct stream_t { VLC_COMMON_MEMBERS + bool b_error; /* Module properties for stream filter */ module_t *p_module; @@ -165,7 +166,7 @@ static inline char *stream_ContentType( stream_t *s ) * You must delete it using stream_Delete. */ 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. */ @@ -175,15 +176,16 @@ VLC_EXPORT( void, stream_DemuxSend, ( stream_t *s, block_t *p_block ) ); * 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, uint64_t i_size, bool b_preserve_memory ) ); +VLC_EXPORT( stream_t *, stream_MemoryNew, (vlc_object_t *p_obj, uint8_t *p_buffer, uint64_t i_size, bool b_preserve_memory ) ); +#define stream_MemoryNew( a, b, c, d ) stream_MemoryNew( VLC_OBJECT(a), b, c, d ) /** * 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 ) ); +VLC_EXPORT( stream_t *, stream_UrlNew, (vlc_object_t *p_this, const char *psz_url ) ); +#define stream_UrlNew( a, b ) stream_UrlNew( VLC_OBJECT(a), b ) + /** * Try to add a stream filter to an open stream.