/* stream_t *s could be null and then it mean a access+demux in one */
#define demux_New( a, b, c, d, e, f,g ) __demux_New(VLC_OBJECT(a),b,c,d,e,f,g)
-demux_t *__demux_New(vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
+demux_t *__demux_New( vlc_object_t *p_obj, const char *psz_access, const char *psz_demux, const char *psz_path, stream_t *s, es_out_t *out, bool );
-void demux_Delete(demux_t *);
+void demux_Delete( demux_t * );
static inline int demux_Demux( demux_t *p_demux )
{
( p_input->p->i_run > 0 && *pi_start_mdate+p_input->p->i_run < mdate() ) )
i_ret = 0; /* EOF */
else
- i_ret = p_input->p->input.p_demux->pf_demux(p_input->p->input.p_demux);
+ i_ret = demux_Demux( p_input->p->input.p_demux );
if( i_ret > 0 )
{
if( i_stime >= i_time )
break;
- if( ( i_ret = in->p_demux->pf_demux( in->p_demux ) ) <= 0 )
+ if( ( i_ret = demux_Demux( in->p_demux ) ) <= 0 )
break;
}
}
else
{
- i_ret = in->p_demux->pf_demux( in->p_demux );
+ i_ret = demux_Demux( in->p_demux );
}
if( i_ret <= 0 )