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

Logo: thread safety fix

There are still bugs. At least posx, posy, pos and b_need_update are not
protected properly, but I don't have time.
parent 165f3496
...@@ -704,6 +704,9 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -704,6 +704,9 @@ static int CreateFilter( vlc_object_t *p_this )
p_logo_list->i_repeat = p_logo_list->i_repeat =
var_CreateGetIntegerCommand( p_filter, "logo-repeat" ); var_CreateGetIntegerCommand( p_filter, "logo-repeat" );
vlc_mutex_init( &p_logo_list->lock );
LoadLogoList( p_this, p_logo_list );
var_AddCallback( p_filter, "logo-file", LogoCallback, p_sys ); var_AddCallback( p_filter, "logo-file", LogoCallback, p_sys );
var_AddCallback( p_filter, "logo-x", LogoCallback, p_sys ); var_AddCallback( p_filter, "logo-x", LogoCallback, p_sys );
var_AddCallback( p_filter, "logo-y", LogoCallback, p_sys ); var_AddCallback( p_filter, "logo-y", LogoCallback, p_sys );
...@@ -711,13 +714,6 @@ static int CreateFilter( vlc_object_t *p_this ) ...@@ -711,13 +714,6 @@ static int CreateFilter( vlc_object_t *p_this )
var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys ); var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys );
var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys ); var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys );
vlc_mutex_init( &p_logo_list->lock );
vlc_mutex_lock( &p_logo_list->lock );
LoadLogoList( p_this, p_logo_list );
vlc_mutex_unlock( &p_logo_list->lock );
/* Misc init */ /* Misc init */
p_filter->pf_sub_filter = Filter; p_filter->pf_sub_filter = Filter;
p_sys->b_need_update = true; p_sys->b_need_update = true;
......
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