Commit 3f9ebd2f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

input item: simplify copying title from meta

parent eb52ecee
...@@ -1347,17 +1347,15 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta ) ...@@ -1347,17 +1347,15 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
{ {
es_out_sys_t *p_sys = p_out->p_sys; es_out_sys_t *p_sys = p_out->p_sys;
input_thread_t *p_input = p_sys->p_input; input_thread_t *p_input = p_sys->p_input;
input_item_t *p_item = input_GetItem( p_input ); input_item_t *p_item = input_GetItem( p_input );
char *psz_title = NULL; if( vlc_meta_Get( p_meta, vlc_meta_Title ) != NULL )
input_item_SetName( p_item, vlc_meta_Get( p_meta, vlc_meta_Title ) );
char *psz_arturl = input_item_GetArtURL( p_item ); char *psz_arturl = input_item_GetArtURL( p_item );
vlc_mutex_lock( &p_item->lock ); vlc_mutex_lock( &p_item->lock );
if( vlc_meta_Get( p_meta, vlc_meta_Title ) )
psz_title = strdup( vlc_meta_Get( p_meta, vlc_meta_Title ) );
vlc_meta_Merge( p_item->p_meta, p_meta ); vlc_meta_Merge( p_item->p_meta, p_meta );
if( !psz_arturl || *psz_arturl == '\0' ) if( !psz_arturl || *psz_arturl == '\0' )
...@@ -1384,11 +1382,6 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta ) ...@@ -1384,11 +1382,6 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
} }
free( psz_arturl ); free( psz_arturl );
if( psz_title )
{
input_item_SetName( p_item, psz_title );
free( psz_title );
}
input_item_SetPreparsed( p_item, true ); input_item_SetPreparsed( p_item, true );
input_SendEventMeta( p_input ); input_SendEventMeta( p_input );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment