lua: Add freebox and frenchtv back in the builtin SD.

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

diff --git a/modules/misc/lua/vlc.c b/modules/misc/lua/vlc.c
index 9ebf9887c71daa2288170dc0361dcbae6efc60b3..9084739a37d31ba2f8830c38d1bd44bda4aa95ee 100644 (file)
--- a/modules/misc/lua/vlc.c
+++ b/modules/misc/lua/vlc.c
@@ -124,6 +124,18 @@ vlc_module_begin ()
         add_string( "lua-sd", "", NULL, "", "", false )
         set_callbacks( Open_LuaSD, Close_LuaSD )
 
+    add_submodule ()
+        set_description( N_("Freebox TV") )
+        add_shortcut( "freebox" )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( Open_LuaSD, Close_LuaSD )
+
+    add_submodule ()
+        set_description( N_("French TV") )
+        add_shortcut( "frenchtv" )
+        set_capability( "services_discovery", 0 )
+        set_callbacks( Open_LuaSD, Close_LuaSD )
+
     VLC_SD_PROBE_SUBMODULE
 
 vlc_module_end ()
@@ -162,6 +174,12 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
         i++;
     free( datadir );
 
+#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
+    if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
+                         config_GetLibDir(), luadirname ) != -1) )
+            i++;
+#endif
+
     char *psz_datapath = config_GetDataDir( p_this );
     if( likely(psz_datapath != NULL) )
     {
@@ -178,12 +196,6 @@ int vlclua_dir_list( vlc_object_t *p_this, const char *luadirname,
         free( psz_datapath );
     }
 
-#if !(defined(__APPLE__) || defined(SYS_BEOS) || defined(WIN32))
-    if( likely(asprintf( &ppsz_dir_list[i], "%s"DIR_SEP"lua"DIR_SEP"%s",
-                         config_GetLibDir(), luadirname ) != -1) )
-            i++;
-#endif
-
     ppsz_dir_list[i] = NULL;
     return VLC_SUCCESS;
 }