# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_block.h>
#define SOUT_CFG_PREFIX "sout-autodel-"
-vlc_module_begin();
- set_shortname( _("Autodel"));
- set_description( _("Automatically add/delete input streams"));
- set_capability( "sout stream", 50 );
- add_shortcut( "autodel" );
- set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+ set_shortname( N_("Autodel"))
+ set_description( N_("Automatically add/delete input streams"))
+ set_capability( "sout stream", 50 )
+ add_shortcut( "autodel" )
+ set_callbacks( Open, Close )
+vlc_module_end ()
/*****************************************************************************
struct sout_stream_sys_t
{
- sout_stream_t *p_out;
sout_stream_id_t **pp_es;
int i_es_num;
};
p_sys = malloc( sizeof( sout_stream_sys_t ) );
- p_sys->p_out = sout_StreamNew( p_stream->p_sout, p_stream->psz_next );
- if( !p_sys->p_out )
+ if( !p_stream->p_next )
{
msg_Err( p_stream, "cannot create chain" );
free( p_sys );
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
- sout_StreamDelete( p_sys->p_out );
p_stream->p_sout->i_out_pace_nocontrol--;
free( p_sys );
p_es->fmt = *p_fmt;
p_es->id = NULL;
- p_es->i_last = 0;
+ p_es->i_last = VLC_TS_INVALID;
p_es->b_error = false;
TAB_APPEND( p_sys->i_es_num, p_sys->pp_es, p_es );
free( p_es );
if ( id != NULL )
- return p_sys->p_out->pf_del( p_sys->p_out, id );
+ return p_stream->p_next->pf_del( p_stream->p_next, id );
else
return VLC_SUCCESS;
}
int i;
p_es->i_last = p_buffer->i_dts;
- if ( p_es->id == NULL && p_es->b_error != true )
+ if ( !p_es->id && !p_es->b_error )
{
- p_es->id = p_sys->p_out->pf_add( p_sys->p_out, &p_es->fmt );
+ p_es->id = p_stream->p_next->pf_add( p_stream->p_next, &p_es->fmt );
if ( p_es->id == NULL )
{
p_es->b_error = true;
}
}
- if ( p_es->b_error != true )
- p_sys->p_out->pf_send( p_sys->p_out, p_es->id, p_buffer );
+ if ( !p_es->b_error )
+ p_stream->p_next->pf_send( p_stream->p_next, p_es->id, p_buffer );
else
block_ChainRelease( p_buffer );
|| p_sys->pp_es[i]->fmt.i_cat == AUDIO_ES)
&& p_sys->pp_es[i]->i_last < i_current )
{
- p_sys->p_out->pf_del( p_sys->p_out, p_sys->pp_es[i]->id );
+ p_stream->p_next->pf_del( p_stream->p_next, p_sys->pp_es[i]->id );
p_sys->pp_es[i]->id = NULL;
}
}