Add --data-path option. Access the src share directory now works from build tree.

[vlc] / modules / misc / lua / intf.c

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index fb4194b044a1c481cd9939d0d9cdd9c3a98b7492..424a32d7bf146144acd9ac91eb34d8de55c5060e 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -52,14 +52,16 @@
  *****************************************************************************/
 static void *Run( void * );
 
+static const char * const ppsz_intf_options[] = { "intf", "config", NULL };
+
 /*****************************************************************************
  *
  *****************************************************************************/
-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;
@@ -126,9 +128,9 @@ static char *GetModuleName( intf_thread_t *p_intf )
 {
     int i;
     const char *psz_intf;
-    if( *p_intf->psz_intf == '$' )
+    /*if( *p_intf->psz_intf == '$' )
         psz_intf = var_GetString( p_intf, p_intf->psz_intf+1 );
-    else
+    else*/
         psz_intf = p_intf->psz_intf;
     for( i = 0; pp_shortcuts[i].psz_name; i++ )
     {
@@ -136,7 +138,7 @@ static char *GetModuleName( intf_thread_t *p_intf )
             return strdup( pp_shortcuts[i].psz_name );
     }
 
-    return config_GetPsz( p_intf, "lua-intf" );
+    return var_CreateGetString( p_intf, "lua-intf" );
 }
 
 static const luaL_Reg p_reg[] = { { NULL, NULL } };
@@ -147,19 +149,20 @@ int Open_LuaIntf( vlc_object_t *p_this )
     intf_sys_t *p_sys;
     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_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*) );
+    p_intf->p_sys = (intf_sys_t*)malloc( sizeof(intf_sys_t) );
     if( !p_intf->p_sys )
     {
         free( psz_name );
         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\".",
@@ -174,6 +177,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
     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;
@@ -221,14 +225,26 @@ int Open_LuaIntf( vlc_object_t *p_this )
     if( asprintf( &psz_command,
                   "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> */
 
-    psz_config = config_GetPsz( p_intf, "lua-config" );
+    psz_config = var_CreateGetString( p_intf, "lua-config" );
     if( psz_config && *psz_config )
     {
         char *psz_buffer;
@@ -250,6 +266,8 @@ int Open_LuaIntf( vlc_object_t *p_this )
             }
         }
     }
+    free( psz_config );
+
     if( b_config_set == false )
     {
         lua_newtable( L );
@@ -280,6 +298,8 @@ void Close_LuaIntf( vlc_object_t *p_this )
     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 );
@@ -292,6 +312,8 @@ void Close_LuaIntf( vlc_object_t *p_this )
     vlc_mutex_destroy( &p_sys->lock );
 
     lua_close( p_sys->L );
+
+    free( p_sys->psz_filename );
     free( p_sys );
 }