No functionnal changes.
/* Allow preroll of data (data with dts/pts < i_pts for all ES will be decoded but not displayed */
ES_OUT_SET_NEXT_DISPLAY_TIME, /* arg1=int64_t i_pts(microsecond) */
- /* Set meta data for group (dynamic) */
- ES_OUT_SET_GROUP_META, /* arg1=int i_group arg2=vlc_meta_t */
- /* Set epg for group (dynamic) */
- ES_OUT_SET_GROUP_EPG, /* arg1=int i_group arg2=vlc_epg_t */
+ /* Set meta data for group (dynamic) (The vlc_meta_t is not modified nor released) */
+ ES_OUT_SET_GROUP_META, /* arg1=int i_group arg2=const vlc_meta_t */
+ /* Set epg for group (dynamic) (The vlc_epg_t is not modified nor released) */
+ ES_OUT_SET_GROUP_EPG, /* arg1=int i_group arg2=const vlc_epg_t */
/* */
ES_OUT_DEL_GROUP, /* arg1=int i_group */
return psz;
}
-static void EsOutProgramMeta( es_out_t *out, int i_group, vlc_meta_t *p_meta )
+static void EsOutProgramMeta( es_out_t *out, int i_group, const vlc_meta_t *p_meta )
{
es_out_sys_t *p_sys = out->p_sys;
es_out_pgrm_t *p_pgrm;
}
}
-static void EsOutProgramEpg( es_out_t *out, int i_group, vlc_epg_t *p_epg )
+static void EsOutProgramEpg( es_out_t *out, int i_group, const vlc_epg_t *p_epg )
{
es_out_sys_t *p_sys = out->p_sys;
input_thread_t *p_input = p_sys->p_input;
case ES_OUT_SET_GROUP_META:
{
int i_group = (int)va_arg( args, int );
- vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t * );
+ const vlc_meta_t *p_meta = va_arg( args, const vlc_meta_t * );
EsOutProgramMeta( out, i_group, p_meta );
return VLC_SUCCESS;
case ES_OUT_SET_GROUP_EPG:
{
int i_group = (int)va_arg( args, int );
- vlc_epg_t *p_epg = (vlc_epg_t*)va_arg( args, vlc_epg_t * );
+ const vlc_epg_t *p_epg = va_arg( args, const vlc_epg_t * );
EsOutProgramEpg( out, i_group, p_epg );
return VLC_SUCCESS;
case ES_OUT_RESET_PCR: /* no arg */
break;
- case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=vlc_meta_t* */
+ case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=const vlc_meta_t* */
{
p_cmd->control.int_meta.i_int = (int)va_arg( args, int );
- vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t * );
+ const vlc_meta_t *p_meta = va_arg( args, const vlc_meta_t * );
if( b_copy )
{
}
else
{
- p_cmd->control.int_meta.p_meta = p_meta;
+ /* The cast is only needed to avoid warning */
+ p_cmd->control.int_meta.p_meta = (vlc_meta_t*)p_meta;
}
break;
}
- case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=vlc_epg_t* */
+ case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=const vlc_epg_t* */
{
p_cmd->control.int_epg.i_int = (int)va_arg( args, int );
- vlc_epg_t *p_epg = (vlc_epg_t*)va_arg( args, vlc_epg_t * );
+ const vlc_epg_t *p_epg = va_arg( args, const vlc_epg_t * );
if( b_copy )
{
}
else
{
- p_cmd->control.int_epg.p_epg = p_epg;
+ /* The cast is only needed to avoid warning */
+ p_cmd->control.int_epg.p_epg = (vlc_epg_t*)p_epg;
}
break;
}
case ES_OUT_RESET_PCR: /* no arg */
return es_out_Control( p_out, i_query );
- case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=vlc_meta_t* */
+ case ES_OUT_SET_GROUP_META: /* arg1=int i_group arg2=const vlc_meta_t* */
return es_out_Control( p_out, i_query, p_cmd->control.int_meta.i_int,
p_cmd->control.int_meta.p_meta );
- case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=vlc_epg_t* */
+ case ES_OUT_SET_GROUP_EPG: /* arg1=int i_group arg2=const vlc_epg_t* */
return es_out_Control( p_out, i_query, p_cmd->control.int_epg.i_int,
p_cmd->control.int_epg.p_epg );