diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-12 22:00:47 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-12-12 22:00:47 +0000 |
| commit | 16b6f9646902e6940a991f1d3577c068573015a8 (patch) | |
| tree | 05401271b5a9a81668a00ddb079d3db259e4bcee /src/input/input_http.c | |
| parent | ec4c867b1a59029166c5efc025966f7886f15c61 (diff) | |
| download | xine-lib-16b6f9646902e6940a991f1d3577c068573015a8.tar.gz xine-lib-16b6f9646902e6940a991f1d3577c068573015a8.tar.bz2 | |
huge patch ahead: reorganizing config entries with automatic conversion
and backwards compatible translation
Sorry, I got a litte tired proof-reading the patch, so their might be
bugs lurking around. I will give it some further examination and
(as necessary) fixing tomorrow.
CVS patchset: 7233
CVS date: 2004/12/12 22:00:47
Diffstat (limited to 'src/input/input_http.c')
| -rw-r--r-- | src/input/input_http.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/input/input_http.c b/src/input/input_http.c index a44c662f2..fbd5d9d87 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -19,7 +19,7 @@ * * input plugin for http network streams * - * $Id: input_http.c,v 1.100 2004/12/01 22:55:31 tmattern Exp $ + * $Id: input_http.c,v 1.101 2004/12/12 22:01:06 mroi Exp $ */ #ifdef HAVE_CONFIG_H @@ -1045,26 +1045,26 @@ static void *init_class (xine_t *xine, void *data) { * proxy settings */ this->proxyhost = config->register_string(config, - "input.http_proxy_host", proxy_env ? this->proxyhost_env : "", + "media.network.http_proxy_host", proxy_env ? this->proxyhost_env : "", _("HTTP proxy host"), _("The hostname of the HTTP proxy."), 10, proxy_host_change_cb, (void *) this); this->proxyport = config->register_num(config, - "input.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT, + "media.network.http_proxy_port", proxy_env ? this->proxyport_env : DEFAULT_HTTP_PORT, _("HTTP proxy port"), _("The port number of the HTTP proxy."), 10, proxy_port_change_cb, (void *) this); /* registered entries could be empty. Don't ignore envvar */ if(!strlen(this->proxyhost) && (proxy_env && strlen(proxy_env))) { - config->update_string(config, "input.http_proxy_host", this->proxyhost_env); - config->update_num(config, "input.http_proxy_port", this->proxyport_env); + config->update_string(config, "media.network.http_proxy_host", this->proxyhost_env); + config->update_num(config, "media.network.http_proxy_port", this->proxyport_env); } this->proxyuser = config->register_string(config, - "input.http_proxy_user", "", _("HTTP proxy username"), + "media.network.http_proxy_user", "", _("HTTP proxy username"), _("The user name for the HTTP proxy."), 10, proxy_user_change_cb, (void *) this); this->proxypassword = config->register_string(config, - "input.http_proxy_password", "", _("HTTP proxy password"), + "media.network.http_proxy_password", "", _("HTTP proxy password"), _("The password for the HTTP proxy."), 10, proxy_password_change_cb, (void *) this); this->noproxylist = config->register_string(config, |