vlc | branch: master | Rémi Duraffort <[email protected]> | Sun Sep 26 20:39:56 2010 +0200| [63ffc8e1218d553842ba80e577b6110bd2d4e48d] | committer: Rémi Duraffort
lua_extension: remove dummy variable (we want to run every extension anyway). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=63ffc8e1218d553842ba80e577b6110bd2d4e48d --- modules/misc/lua/extension.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/misc/lua/extension.c b/modules/misc/lua/extension.c index 498f50c..2a529b8 100644 --- a/modules/misc/lua/extension.c +++ b/modules/misc/lua/extension.c @@ -56,7 +56,7 @@ const char* const ppsz_capabilities[] = { static int ScanExtensions( extensions_manager_t *p_this ); static int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script, - void *pb_continue ); + void *dummy ); static int Control( extensions_manager_t *, int, va_list ); static int GetMenuEntries( extensions_manager_t *p_mgr, extension_t *p_ext, char ***pppsz_titles, uint16_t **ppi_ids ); @@ -181,12 +181,11 @@ void Close_Extension( vlc_object_t *p_this ) **/ static int ScanExtensions( extensions_manager_t *p_mgr ) { - bool b_true = true; int i_ret = vlclua_scripts_batch_execute( VLC_OBJECT( p_mgr ), "extensions", &ScanLuaCallback, - &b_true ); + NULL ); if( !i_ret ) return VLC_EGENERIC; @@ -211,11 +210,12 @@ static int vlclua_dummy_require( lua_State *L ) * @param p_this This extensions_manager_t object * @param psz_script Name of the script to run * @param L Lua State, common to all scripts here - * @param pb_continue bool* that indicates whether to continue batch or not + * @param dummy: unused **/ int ScanLuaCallback( vlc_object_t *p_this, const char *psz_script, - void *pb_continue ) + void *dummy ) { + VLC_UNUSED(dummy); extensions_manager_t *p_mgr = ( extensions_manager_t* ) p_this; bool b_ok = false; @@ -411,7 +411,7 @@ exit: vlc_mutex_unlock( &p_mgr->lock ); /* Continue batch execution */ - return pb_continue ? ( (* (bool*)pb_continue) ? -1 : 0 ) : -1; + return VLC_EGENERIC; } static int Control( extensions_manager_t *p_mgr, int i_control, va_list args ) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
