Commit 04192313 authored by Rémi Duraffort's avatar Rémi Duraffort

lua extensions: remove dummy function (moreover vlc_join is simpler to understand)

parent 2d0aee25
...@@ -136,7 +136,7 @@ void Close_Extension( vlc_object_t *p_this ) ...@@ -136,7 +136,7 @@ void Close_Extension( vlc_object_t *p_this )
if( !p_ext ) break; if( !p_ext ) break;
msg_Dbg( p_mgr, "Deactivating '%s'", p_ext->psz_title ); msg_Dbg( p_mgr, "Deactivating '%s'", p_ext->psz_title );
Deactivate( p_mgr, p_ext ); Deactivate( p_mgr, p_ext );
WaitForDeactivation( p_ext ); vlc_join( p_ext->p_sys->thread, NULL );
} }
FOREACH_END() FOREACH_END()
......
...@@ -94,7 +94,6 @@ struct extension_sys_t ...@@ -94,7 +94,6 @@ struct extension_sys_t
int Activate( extensions_manager_t *p_mgr, extension_t * ); int Activate( extensions_manager_t *p_mgr, extension_t * );
bool IsActivated( extensions_manager_t *p_mgr, extension_t * ); bool IsActivated( extensions_manager_t *p_mgr, extension_t * );
int Deactivate( extensions_manager_t *p_mgr, extension_t * ); int Deactivate( extensions_manager_t *p_mgr, extension_t * );
void WaitForDeactivation( extension_t *p_ext );
int __PushCommand( extension_t *ext, bool unique, command_type_e cmd, va_list options ); int __PushCommand( extension_t *ext, bool unique, command_type_e cmd, va_list options );
static inline int PushCommand( extension_t *ext, int cmd, ... ) static inline int PushCommand( extension_t *ext, int cmd, ... )
{ {
......
...@@ -200,12 +200,6 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext ) ...@@ -200,12 +200,6 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext )
return (i_idx >= 0) ? VLC_SUCCESS : VLC_EGENERIC; return (i_idx >= 0) ? VLC_SUCCESS : VLC_EGENERIC;
} }
/** Wait for an extension to finish */
void WaitForDeactivation( extension_t *p_ext )
{
vlc_join( p_ext->p_sys->thread, NULL );
}
/** Push a UI command */ /** Push a UI command */
int __PushCommand( extension_t *p_ext, bool b_unique, command_type_e i_command, int __PushCommand( extension_t *p_ext, bool b_unique, command_type_e i_command,
va_list args ) va_list args )
......
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