mirrors/vlc
0
0
Fork 0
mirror of https://github.com/videolan/vlc.git synced 2024-11-23 18:03:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

input: es_out: don't use meta from metaless programs

Browse Source 
refs #17933
This commit is contained in:
Francois Cartegnie 2017-01-31 16:47:11 +01:00
parent c12d9fb6a7
commit 9c4f6bb417
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/input/es_out.c
View File

@ -1058,14 +1058,17 @@ static void EsOutProgramSelect( es_out_t *out, es_out_pgrm_t *p_pgrm )
input_item_ChangeEPGSource( input_priv(p_input)->p_item, p_pgrm->i_id );
/* Update now playing */
input_item_SetESNowPlaying( input_priv(p_input)->p_item,
p_pgrm->p_meta ? vlc_meta_Get( p_pgrm->p_meta, vlc_meta_ESNowPlaying ) : NULL );
input_item_SetPublisher( input_priv(p_input)->p_item,
p_pgrm->p_meta ? vlc_meta_Get( p_pgrm->p_meta, vlc_meta_Publisher ) : NULL);
input_item_SetTitle( input_priv(p_input)->p_item,
p_pgrm->p_meta ? vlc_meta_Get( p_pgrm->p_meta, vlc_meta_Title ) : NULL );
/* FIXME: we probably want to replace every input meta */
input_SendEventMeta( p_input );
if( p_pgrm->p_meta )
{
input_item_SetESNowPlaying( input_priv(p_input)->p_item,
vlc_meta_Get( p_pgrm->p_meta, vlc_meta_ESNowPlaying ) );
input_item_SetPublisher( input_priv(p_input)->p_item,
vlc_meta_Get( p_pgrm->p_meta, vlc_meta_Publisher ) );
input_item_SetTitle( input_priv(p_input)->p_item,
vlc_meta_Get( p_pgrm->p_meta, vlc_meta_Title ) );
input_SendEventMeta( p_input );
/* FIXME: we probably want to replace every input meta */
}
}
/* EsOutAddProgram: