diff --git a/modules/lua/vlc.c b/modules/lua/vlc.c index ff5c04bf2a..c6f210f1b8 100644 --- a/modules/lua/vlc.c +++ b/modules/lua/vlc.c @@ -61,6 +61,19 @@ #define INDEX_TEXT N_( "Directory index" ) #define INDEX_LONGTEXT N_( "Allow to build directory index" ) +#define SOCKS_SERVER_TEXT N_("SOCKS server") +#define SOCKS_SERVER_LONGTEXT N_( \ + "SOCKS proxy server to use. This must be of the form " \ + "address:port. It will be used for all TCP connections" ) + +#define SOCKS_USER_TEXT N_("SOCKS user name") +#define SOCKS_USER_LONGTEXT N_( \ + "User name to be used for connection to the SOCKS proxy." ) + +#define SOCKS_PASS_TEXT N_("SOCKS password") +#define SOCKS_PASS_LONGTEXT N_( \ + "Password to be used for connection to the SOCKS proxy." ) + #define TELNETHOST_TEXT N_( "Host" ) #define TELNETHOST_LONGTEXT N_( "This is the host on which the " \ "interface will listen. It defaults to all network interfaces (0.0.0.0)." \ @@ -649,6 +662,14 @@ vlc_module_begin () set_callbacks( Open_LuaIntf, Close_LuaIntf ) add_shortcut( "luaintf" ) + set_section( N_( "Socks proxy") , NULL ) + add_string( "socks", NULL, + SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT ) + add_string( "socks-user", NULL, + SOCKS_USER_TEXT, SOCKS_USER_LONGTEXT ) + add_password( "socks-pwd", NULL, + SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT ) + add_submodule () set_section( N_("Lua HTTP"), 0 ) add_password("http-password", NULL, PASS_TEXT, PASS_LONGTEXT) diff --git a/src/libvlc-module.c b/src/libvlc-module.c index a49d9cdc24..e043245fdf 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -970,19 +970,6 @@ static const char* const ppsz_restore_playback_desc[] = { #define PROXY_PASS_LONGTEXT N_( \ "If your HTTP proxy requires a password, set it here." ) -#define SOCKS_SERVER_TEXT N_("SOCKS server") -#define SOCKS_SERVER_LONGTEXT N_( \ - "SOCKS proxy server to use. This must be of the form " \ - "address:port. It will be used for all TCP connections" ) - -#define SOCKS_USER_TEXT N_("SOCKS user name") -#define SOCKS_USER_LONGTEXT N_( \ - "User name to be used for connection to the SOCKS proxy." ) - -#define SOCKS_PASS_TEXT N_("SOCKS password") -#define SOCKS_PASS_LONGTEXT N_( \ - "Password to be used for connection to the SOCKS proxy." ) - #define META_TITLE_TEXT N_("Title metadata") #define META_TITLE_LONGTEXT N_( \ "Allows you to specify a \"title\" metadata for an input.") @@ -1963,15 +1950,6 @@ vlc_module_begin () #endif add_obsolete_bool( "http-use-IE-proxy" ) /* since 4.0.0 */ - set_section( N_( "Socks proxy") , NULL ) - add_string( "socks", NULL, - SOCKS_SERVER_TEXT, SOCKS_SERVER_LONGTEXT ) - add_string( "socks-user", NULL, - SOCKS_USER_TEXT, SOCKS_USER_LONGTEXT ) - add_password( "socks-pwd", NULL, - SOCKS_PASS_TEXT, SOCKS_PASS_LONGTEXT ) - - set_section( N_("Metadata" ) , NULL ) add_string( "meta-title", NULL, META_TITLE_TEXT, META_TITLE_LONGTEXT )