[vlc-commits] commit: lua extensions: remove dummy function ( moreover vlc_join is simpler to understand) ( Rémi Duraffort )

[git at videolan.org]

vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Oct 11 21:06:39 2010 +0200| [041923136e2698f652c4f5e71dd646d908c00464] | committer: Rémi Duraffort 

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=041923136e2698f652c4f5e71dd646d908c00464
---

 modules/misc/lua/extension.c        |    2 +-
 modules/misc/lua/extension.h        |    1 -
 modules/misc/lua/extension_thread.c |    6 ------
 3 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c
index df7a465..d0b3183 100644
--- a/modules/misc/lua/extension.c
+++ b/modules/misc/lua/extension.c
@@ -136,7 +136,7 @@ void Close_Extension( vlc_object_t *p_this )
         if( !p_ext ) break;
         msg_Dbg( p_mgr, "Deactivating '%s'", p_ext->psz_title );
         Deactivate( p_mgr, p_ext );
-        WaitForDeactivation( p_ext );
+        vlc_join( p_ext->p_sys->thread, NULL );
     }
     FOREACH_END()
 
diff --git a/modules/misc/lua/extension.h b/modules/misc/lua/extension.h
index 7ac322f..261de76 100644
--- a/modules/misc/lua/extension.h
+++ b/modules/misc/lua/extension.h
@@ -94,7 +94,6 @@ struct extension_sys_t
 int Activate( 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 * );
-void WaitForDeactivation( extension_t *p_ext );
 int __PushCommand( extension_t *ext, bool unique, command_type_e cmd, va_list options );
 static inline int PushCommand( extension_t *ext, int cmd, ... )
 {
diff --git a/modules/misc/lua/extension_thread.c b/modules/misc/lua/extension_thread.c
index 318eb74..7f2ab36 100644
--- a/modules/misc/lua/extension_thread.c
+++ b/modules/misc/lua/extension_thread.c
@@ -200,12 +200,6 @@ static int RemoveActivated( extensions_manager_t *p_mgr, extension_t *p_ext )
     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 */
 int __PushCommand( extension_t *p_ext,  bool b_unique, command_type_e i_command,
                    va_list args )