Qt: CaptureOpenPanel: check and prefill with usual devices

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

diff --git a/modules/misc/lua/services_discovery.c b/modules/misc/lua/services_discovery.c
index 972336a1664a83d1fd9a69ecc51a37d337d705f4..467a4aae4a34f98dfd629ebfa333d29b56c87e65 100644 (file)
--- a/modules/misc/lua/services_discovery.c
+++ b/modules/misc/lua/services_discovery.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * services_discovery.c : Services discovery using lua scripts
  *****************************************************************************
- * Copyright (C) 2009 the VideoLAN team
+ * Copyright (C) 2009 VideoLAN and AUTHORS
  *
  * Authors: Fabio Ritrovato <sephiroth87 at videolan dot org>
  *
@@ -26,7 +26,6 @@
 
 #include <vlc_common.h>
 #include <vlc_services_discovery.h>
-#include <vlc_playlist.h>
 
 #include "vlc.h"
 #include "libs.h"
@@ -36,7 +35,7 @@
  *****************************************************************************/
 static void *Run( void * );
 
-static const char * const ppsz_sd_options[] = { "sd", NULL };
+static const char * const ppsz_sd_options[] = { "sd", "longname", NULL };
 
 /*****************************************************************************
  * Local structures
@@ -56,8 +55,8 @@ int Open_LuaSD( vlc_object_t *p_this )
 {
     services_discovery_t *p_sd = ( services_discovery_t * )p_this;
     services_discovery_sys_t *p_sys;
-    lua_State *L;
-    char *psz_name = strdup(p_sd->psz_name);
+    lua_State *L = NULL;
+    char *psz_name = NULL;
 
     if( !strcmp(p_sd->psz_name, "lua"))
     {
@@ -74,7 +73,10 @@ int Open_LuaSD( vlc_object_t *p_this )
     }
 
     if( !( p_sys = malloc( sizeof( services_discovery_sys_t ) ) ) )
+    {
+        free( psz_name );
         return VLC_ENOMEM;
+    }
     p_sd->p_sys = p_sys;
     p_sys->psz_filename = vlclua_find_file( p_this, "sd", psz_name );
     if( !p_sys->psz_filename )
@@ -91,28 +93,27 @@ int Open_LuaSD( vlc_object_t *p_this )
         msg_Err( p_sd, "Could not create new Lua State" );
         goto error;
     }
+    vlclua_set_this( L, p_sd );
     luaL_openlibs( L );
     luaL_register( L, "vlc", p_reg );
-    lua_pushlightuserdata( L, p_sd );
-    lua_setfield( L, -2, "private" );
     luaopen_input( L );
     luaopen_msg( L );
     luaopen_misc( L );
     luaopen_net( L );
     luaopen_object( L );
-    luaopen_playlist( L );
     luaopen_sd( L );
     luaopen_strings( L );
     luaopen_variables( L );
     luaopen_stream( L );
     luaopen_gettext( L );
     luaopen_xml( L );
+    luaopen_md5( L );
     lua_pop( L, 1 );
+
     if( vlclua_add_modules_path( p_sd, L, p_sys->psz_filename ) )
     {
         msg_Warn( p_sd, "Error while setting the module search path for %s",
                   p_sys->psz_filename );
-        lua_close( L );
         goto error;
     }
     if( luaL_dofile( L, p_sys->psz_filename ) )
@@ -121,17 +122,17 @@ int Open_LuaSD( vlc_object_t *p_this )
         msg_Err( p_sd, "Error loading script %s: %s", p_sys->psz_filename,
                   lua_tostring( L, lua_gettop( L ) ) );
         lua_pop( L, 1 );
-        lua_close( L );
         goto error;
     }
     p_sys->L = L;
     if( vlc_clone (&p_sd->p_sys->thread, Run, p_sd, VLC_THREAD_PRIORITY_LOW) )
     {
-        lua_close( L );
         goto error;
     }
     return VLC_SUCCESS;
 error:
+    if( L )
+        lua_close( L );
     free( p_sys->psz_filename );
     free( p_sys );
     return VLC_EGENERIC;
@@ -162,12 +163,17 @@ static void* Run( void *data )
     lua_getglobal( L, "main" );
     if( !lua_isfunction( L, lua_gettop( L ) ) || lua_pcall( L, 0, 1, 0 ) )
     {
-        msg_Err( p_sd, "Error while runing script %s, "
+        msg_Err( p_sd, "Error while running script %s, "
                   "function main(): %s", p_sys->psz_filename,
                   lua_tostring( L, lua_gettop( L ) ) );
         lua_pop( L, 1 );
         return NULL;
     }
-    msg_Dbg( p_sd, "LuaSD script loaded: %s", p_sd->psz_name );
+    msg_Dbg( p_sd, "LuaSD script loaded: %s", p_sys->psz_filename );
+
+    /* Force garbage collection, because the core will keep the SD
+     * open, but lua will never gc until lua_close(). */
+    lua_gc( L, LUA_GCCOLLECT, 0 );
+
     return NULL;
 }