vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Wed Jun 29 19:44:17 2016 +0300| [650903fef6e09024be9f2a9be40e2c78c41b21b2] | committer: Rémi Denis-Courmont
http: move relevant config items to new plugin > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=650903fef6e09024be9f2a9be40e2c78c41b21b2 --- modules/access/http.c | 28 ---------------------------- modules/access/http/access.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 28 deletions(-) diff --git a/modules/access/http.c b/modules/access/http.c index f05f3a8..60d2488 100644 --- a/modules/access/http.c +++ b/modules/access/http.c @@ -71,24 +71,6 @@ static void Close( vlc_object_t * ); "Automatically try to reconnect to the stream in case of a sudden " \ "disconnect." ) -#define CONTINUOUS_TEXT N_("Continuous stream") -#define CONTINUOUS_LONGTEXT N_("Read a file that is " \ - "being constantly updated (for example, a JPG file on a server). " \ - "You should not globally enable this option as it will break all other " \ - "types of HTTP streams." ) - -#define FORWARD_COOKIES_TEXT N_("Forward Cookies") -#define FORWARD_COOKIES_LONGTEXT N_("Forward Cookies across http redirections.") - -#define REFERER_TEXT N_("HTTP referer value") -#define REFERER_LONGTEXT N_("Customize the HTTP referer, simulating a previous document") - -#define UA_TEXT N_("User Agent") -#define UA_LONGTEXT N_("The name and version of the program will be " \ - "provided to the HTTP server. They must be separated by a forward " \ - "slash, e.g. FooBar/1.2.3. This option can only be specified per input " \ - "item, not globally.") - vlc_module_begin () set_description( N_("HTTP input") ) set_capability( "access", 0 ) @@ -101,18 +83,8 @@ vlc_module_begin () add_password( "http-proxy-pwd", NULL, PROXY_PASS_TEXT, PROXY_PASS_LONGTEXT, false ) add_obsolete_bool( "http-use-IE-proxy" ) - add_string( "http-referrer", NULL, REFERER_TEXT, REFERER_LONGTEXT, false ) - change_safe() - add_string( "http-user-agent", NULL, UA_TEXT, UA_LONGTEXT, false ) - change_safe() - change_private() add_bool( "http-reconnect", false, RECONNECT_TEXT, RECONNECT_LONGTEXT, true ) - add_bool( "http-continuous", false, CONTINUOUS_TEXT, - CONTINUOUS_LONGTEXT, true ) - change_safe() - add_bool( "http-forward-cookies", true, FORWARD_COOKIES_TEXT, - FORWARD_COOKIES_LONGTEXT, true ) /* 'itpc' = iTunes Podcast */ add_shortcut( "http", "https", "unsv", "itpc", "icyx" ) set_callbacks( Open, Close ) diff --git a/modules/access/http/access.c b/modules/access/http/access.c index 4e0663c..01405d6 100644 --- a/modules/access/http/access.c +++ b/modules/access/http/access.c @@ -293,4 +293,23 @@ vlc_module_begin() add_bool("http2", false, N_("Force HTTP/2"), N_("Force HTTP version 2.0 over TCP."), true) + + add_bool("http-continuous", false, N_("Continuous stream"), + N_("Keep reading a resource that keeps being updated."), true) + change_safe() + change_volatile() + add_bool("http-forward-cookies", true, N_("Cookies forwarding"), + N_("Forward cookies across HTTP redirections."), true) + add_string("http-referrer", NULL, N_("Referrer"), + N_("Provide the referral URL, i.e. HTTP \"Referer\" (sic)."), + true) + change_safe() + change_volatile() + add_string("http-user-agent", NULL, N_("User agent"), + N_("Override the name and version of the application as " + "provided to the HTTP server, i.e. the HTTP \"User-Agent\". " + "Name and version must be separated by a forward slash, " + "e.g. \"FooBar/1.2.3\"."), true) + change_safe() + change_private() vlc_module_end() _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits