Don't use printf to print debug output.

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

diff --git a/modules/misc/lua/intf.c b/modules/misc/lua/intf.c
index 9c8c64b8fe757ca8986943e8b3681cf71b0a93f9..23943fea13c6acb9f77b84c34d8d83da2bc884c6 100644 (file)
--- a/modules/misc/lua/intf.c
+++ b/modules/misc/lua/intf.c
@@ -34,11 +34,12 @@
 
 #include <vlc_common.h>
 #include <vlc_meta.h>
-#include <vlc_charset.h>
 
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_aout.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include <lua.h>        /* Low level lua C API */
 #include <lauxlib.h>    /* Higher level C API */
@@ -57,34 +58,6 @@ static const char * const ppsz_intf_options[] = { "intf", "config", NULL };
 /*****************************************************************************
  *
  *****************************************************************************/
-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( p_this, "intf", ppsz_dir_list );
-    for( ppsz_dir = ppsz_dir_list; *ppsz_dir; ppsz_dir++ )
-    {
-        char *psz_filename;
-        FILE *fp;
-        if( asprintf( &psz_filename, "%s"DIR_SEP"%s.lua", *ppsz_dir,
-                      psz_name ) < 0 )
-        {
-            vlclua_dir_list_free( ppsz_dir_list );
-            return NULL;
-        }
-        fp = fopen( psz_filename, "r" );
-        if( fp )
-        {
-            fclose( fp );
-            vlclua_dir_list_free( ppsz_dir_list );
-            return psz_filename;
-        }
-        free( psz_filename );
-    }
-    vlclua_dir_list_free( ppsz_dir_list );
-    return NULL;
-}
-
 static inline void luaL_register_submodule( lua_State *L, const char *psz_name,
                                             const luaL_Reg *l )
 {
@@ -179,7 +152,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
         return VLC_ENOMEM;
     }
     p_sys = p_intf->p_sys;
-    p_sys->psz_filename = FindFile( p_this, psz_name );
+    p_sys->psz_filename = vlclua_find_file( p_this, "intf", psz_name );
     if( !p_sys->psz_filename )
     {
         msg_Err( p_intf, "Couldn't find lua interface script \"%s\".",
@@ -195,15 +168,13 @@ int Open_LuaIntf( vlc_object_t *p_this )
         goto error;
     }
 
+    vlclua_set_this( L, p_intf );
+
     luaL_openlibs( L );
 
     /* register our functions */
     luaL_register( L, "vlc", p_reg );
 
-    /* store a pointer to p_intf (FIXME: user could overwrite this) */
-    lua_pushlightuserdata( L, p_intf );
-    lua_setfield( L, -2, "private" );
-
     /* register submodules */
     luaopen_acl( L );
     luaopen_config( L );
@@ -224,32 +195,20 @@ int Open_LuaIntf( vlc_object_t *p_this )
     luaopen_vlm( L );
     luaopen_volume( L );
     luaopen_gettext( L );
+    luaopen_xml( L );
+    luaopen_md5( L );
 
     /* clean up */
     lua_pop( L, 1 );
 
-    /* <gruik> */
     /* Setup the module search path */
+    if( vlclua_add_modules_path( p_intf, L, p_sys->psz_filename ) )
     {
-    char *psz_command;
-    char *psz_char = strrchr(p_sys->psz_filename,DIR_SEP_CHAR);
-    *psz_char = '\0';
-    /* FIXME: don't use luaL_dostring */
-    if( asprintf( &psz_command,
-                  "package.path = [[%s"DIR_SEP"modules"DIR_SEP"?.lua;]]..package.path",
-                  p_sys->psz_filename ) < 0 )
-    {
+        msg_Warn( p_intf, "Error while setting the module search path for %s",
+                  p_sys->psz_filename );
+        lua_close( L );
         goto error;
     }
-    *psz_char = DIR_SEP_CHAR;
-    if( luaL_dostring( L, psz_command ) )
-    {
-        free( psz_command );
-        goto error;
-    }
-    free( psz_command );
-    }
-    /* </gruik> */
 
     psz_config = var_CreateGetString( p_intf, "lua-config" );
     if( psz_config && *psz_config )
@@ -257,7 +216,7 @@ int Open_LuaIntf( vlc_object_t *p_this )
         char *psz_buffer;
         if( asprintf( &psz_buffer, "config={%s}", psz_config ) != -1 )
         {
-            printf("%s\n", psz_buffer);
+            msg_Dbg( p_intf, "Setting config variable: %s", psz_buffer );
             if( luaL_dostring( L, psz_buffer ) == 1 )
                 msg_Err( p_intf, "Error while parsing \"lua-config\"." );
             free( psz_buffer );
@@ -312,6 +271,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 );
+
     vlc_mutex_lock( &p_sys->lock );
     p_sys->exiting = true;
     vlc_cond_signal( &p_sys->wait );