sout_access_out_t *p_access;
int (*pf_addstream)( sout_mux_t *, sout_input_t * );
- int (*pf_delstream)( sout_mux_t *, sout_input_t * );
+ void (*pf_delstream)( sout_mux_t *, sout_input_t * );
int (*pf_mux) ( sout_mux_t * );
int (*pf_control) ( sout_mux_t *, int, va_list );
struct sout_input_t
{
- es_format_t *p_fmt;
- block_fifo_t *p_fifo;
-
- void *p_sys;
+ const es_format_t *p_fmt;
+ block_fifo_t *p_fifo;
+ void *p_sys;
+ es_format_t fmt;
};
VLC_API sout_mux_t * sout_MuxNew( sout_instance_t*, const char *, sout_access_out_t * ) VLC_USED;
-VLC_API sout_input_t * sout_MuxAddStream( sout_mux_t *, es_format_t * ) VLC_USED;
+VLC_API sout_input_t *sout_MuxAddStream( sout_mux_t *, const es_format_t * ) VLC_USED;
VLC_API void sout_MuxDeleteStream( sout_mux_t *, sout_input_t * );
VLC_API void sout_MuxDelete( sout_mux_t * );
VLC_API int sout_MuxSendBuffer( sout_mux_t *, sout_input_t *, block_t * );
-VLC_API int sout_MuxGetStream(sout_mux_t *, int , mtime_t *);
+VLC_API int sout_MuxGetStream(sout_mux_t *, unsigned, mtime_t *);
static inline int sout_MuxControl( sout_mux_t *p_mux, int i_query, ... )
{
sout_stream_t *p_next;
/* add, remove a stream */
- sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, es_format_t * );
- int (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * );
+ sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, const es_format_t * );
+ void (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * );
/* manage a packet */
int (*pf_send)( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
VLC_API sout_stream_t *sout_StreamChainNew(sout_instance_t *p_sout,
char *psz_chain, sout_stream_t *p_next, sout_stream_t **p_last) VLC_USED;
-static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s, es_format_t *fmt )
+static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s,
+ const es_format_t *fmt )
{
return s->pf_add( s, fmt );
}
-static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id )
+
+static inline void sout_StreamIdDel( sout_stream_t *s,
+ sout_stream_id_sys_t *id )
{
- return s->pf_del( s, id );
+ s->pf_del( s, id );
}
-static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_sys_t *id, block_t *b )
+
+static inline int sout_StreamIdSend( sout_stream_t *s,
+ sout_stream_id_sys_t *id, block_t *b )
{
return s->pf_send( s, id, b );
}
* Announce handler
****************************************************************************/
VLC_API session_descriptor_t* sout_AnnounceRegisterSDP( vlc_object_t *, const char *, const char * ) VLC_USED;
-VLC_API int sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
+VLC_API void sout_AnnounceUnRegister(vlc_object_t *,session_descriptor_t* );
#define sout_AnnounceRegisterSDP(o, sdp, addr) \
sout_AnnounceRegisterSDP(VLC_OBJECT (o), sdp, addr)
#define sout_AnnounceUnRegister(o, a) \