[vlc-devel] [PATCH] lua: appropriate --lua option and fix caption

[Rémi Denis-Courmont]

---
 modules/lua/vlc.c   | 3 +++
 src/libvlc-module.c | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c
index 8238efdf52..d237f8d164 100644
--- a/modules/lua/vlc.c
+++ b/modules/lua/vlc.c
@@ -45,6 +45,8 @@
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
+
+#define INPUT_LUA_TEXT N_("Enable Lua plugins")
 #define INTF_TEXT N_("Lua interface")
 #define INTF_LONGTEXT N_("Lua interface module to load")
 
@@ -78,6 +80,7 @@ vlc_module_begin ()
         set_category( CAT_INTERFACE )
         set_subcategory( SUBCAT_INTERFACE_MAIN )
 
+        add_bool( "lua", true, LUA_TEXT, LUA_TEXT, true );
         add_string( "lua-intf", "dummy", INTF_TEXT, INTF_LONGTEXT, false )
         add_string( "lua-config", "", CONFIG_TEXT, CONFIG_LONGTEXT, false )
         set_capability( "interface", 0 )
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 9da8fa407b..5f3c93c53c 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -723,8 +723,6 @@ static const char *const ppsz_prefres[] = {
     "$n: Track num<br>$p: Now playing<br>$A: Date<br>$D: Duration<br>"  \
     "$Z: \"Now playing\" (Fall back on Title - Artist)" )
 
-#define INPUT_LUA_TEXT N_( "Disable all lua plugins" )
-
 // DEPRECATED
 #define SUB_CAT_LONGTEXT N_( \
     "These options allow you to modify the behavior of the subpictures " \
@@ -2000,8 +1998,6 @@ vlc_module_begin ()
 
     add_string( "input-title-format", "$Z", INPUT_TITLE_FORMAT_TEXT, INPUT_TITLE_FORMAT_LONGTEXT, false );
 
-    add_bool( "lua", true, INPUT_LUA_TEXT, INPUT_LUA_TEXT, true );
-
 /* Decoder options */
     set_subcategory( SUBCAT_INPUT_VCODEC )
     add_category_hint(N_("Decoders"), CODEC_CAT_LONGTEXT)
-- 
2.20.1