/*****************************************************************************
*
*****************************************************************************/
-static char *FindFile( const char *psz_name )
+static char *FindFile( vlc_object_t *p_this, const char *psz_name )
{
char *ppsz_dir_list[] = { NULL, NULL, NULL, NULL };
char **ppsz_dir;
- vlclua_dir_list( "intf", ppsz_dir_list );
+ vlclua_dir_list( p_this, "intf", ppsz_dir_list );
for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
{
char *psz_filename;
const char *psz_name;
} pp_shortcuts[] = {
{ "luarc", "rc" },
- /* { "rc", "rc" }, */
+ { "rc", "rc" },
{ "luahotkeys", "hotkeys" },
/* { "hotkeys", "hotkeys" }, */
{ "luatelnet", "telnet" },
- /* { "telnet", "telnet" }, */
+ { "telnet", "telnet" },
{ "luahttp", "http" },
- /* { "http", "http" }, */
+ { "http", "http" },
{ NULL, NULL } };
static bool WordInList( const char *psz_list, const char *psz_word )
lua_State *L;
config_ChainParse( p_intf, "lua-", ppsz_intf_options, p_intf->p_cfg );
- char *psz_name = GetModuleName( p_intf );
- const char *psz_config;
+ char *psz_name = NULL;
+
+ if( !p_intf->b_force )
+ psz_name = strdup( "rc" );
+ else
+ psz_name = GetModuleName( p_intf );
+ if( !psz_name ) psz_name = strdup( "dummy" );
+
+ char *psz_config;
bool b_config_set = false;
- if( !psz_name ) psz_name = strdup( "dummy" );
p_intf->p_sys = (intf_sys_t*)malloc( sizeof(intf_sys_t) );
if( !p_intf->p_sys )
return VLC_ENOMEM;
}
p_sys = p_intf->p_sys;
- p_sys->psz_filename = FindFile( psz_name );
+ p_sys->psz_filename = FindFile( p_this, psz_name );
if( !p_sys->psz_filename )
{
msg_Err( p_intf, "Couldn't find lua interface script \"%s\".",
if( !L )
{
msg_Err( p_intf, "Could not create new Lua State" );
+ free( p_sys->psz_filename );
free( psz_name );
free( p_sys );
return VLC_EGENERIC;
luaopen_video( L );
luaopen_vlm( L );
luaopen_volume( L );
+ luaopen_gettext( L );
/* clean up */
lua_pop( L, 1 );
"package.path = \"%s"DIR_SEP"modules"DIR_SEP"?.lua;\"..package.path",
p_sys->psz_filename ) < 0 )
{
+ free( p_sys->psz_filename );
free( psz_name );
free( p_sys );
return VLC_EGENERIC;
*psz_char = DIR_SEP_CHAR;
if( luaL_dostring( L, psz_command ) )
{
+ free( psz_command );
+ free( p_sys->psz_filename );
free( psz_name );
free( p_sys );
return VLC_EGENERIC;
}
+ free( psz_command );
}
/* </gruik> */
}
}
}
+ free( psz_config );
+
if( b_config_set == false )
{
lua_newtable( L );
intf_thread_t *p_intf = (intf_thread_t*)p_this;
intf_sys_t *p_sys = p_intf->p_sys;
+ vlc_cancel( p_sys->thread );
+
if( !p_sys->exiting ) /* <- Read-only here and in thread: no locking */
{
vlc_mutex_lock( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
lua_close( p_sys->L );
+
+ free( p_sys->psz_filename );
free( p_sys );
}