#endif
#include <vlc/vlc.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_block.h>
set_category( CAT_SOUT );
set_subcategory( SUBCAT_SOUT_STREAM );
add_bool( SOUT_CFG_PREFIX "audio", 1, NULL, AUDIO_TEXT,
- AUDIO_LONGTEXT, VLC_TRUE );
+ AUDIO_LONGTEXT, true );
add_bool( SOUT_CFG_PREFIX "video", 1, NULL, VIDEO_TEXT,
- VIDEO_LONGTEXT, VLC_TRUE );
+ VIDEO_LONGTEXT, true );
add_integer( SOUT_CFG_PREFIX "delay", 100, NULL, DELAY_TEXT,
- DELAY_LONGTEXT, VLC_TRUE );
+ DELAY_LONGTEXT, true );
set_callbacks( Open, Close );
vlc_module_end();
input_thread_t *p_input;
unsigned i_es;
- vlc_bool_t b_audio;
- vlc_bool_t b_video;
+ bool b_audio;
+ bool b_video;
mtime_t i_delay;
};
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys;
- vlc_value_t val;
+
+ p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
config_ChainParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options,
p_stream->p_cfg );
- p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->p_input = NULL;
p_sys->i_es = 0;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "audio", &val );
- p_sys->b_audio = val.b_bool;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "video", &val );
- p_sys->b_video = val.b_bool;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "delay", &val );
- p_sys->i_delay = (int64_t)val.i_int * 1000;
+ p_sys->b_audio = var_GetBool( p_stream, SOUT_CFG_PREFIX"audio" );
+ p_sys->b_video = var_GetBool( p_stream, SOUT_CFG_PREFIX "video" );
+ p_sys->i_delay = var_GetInteger( p_stream, SOUT_CFG_PREFIX "delay" );
+ p_sys->i_delay *= 1000;
p_stream->pf_add = Add;
p_stream->pf_del = Del;
p_stream->pf_send = Send;
-
p_stream->p_sys = p_sys;
/* update p_sout->i_out_pace_nocontrol */
}
}
- id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, VLC_TRUE );
+ id->p_dec = input_DecoderNew( p_sys->p_input, p_fmt, true );
if( id->p_dec == NULL )
{
msg_Err( p_stream, "cannot create decoder for fcc=`%4.4s'",