oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

config/Option: convert to strictly-typed enum

Browse Source
This commit is contained in:
Max Kellermann
2015-01-21 22:36:13 +01:00
parent 10972da060
commit 1c3f5517fa
36 changed files with 153 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/Init.cxx
View File

@@ -43,7 +43,8 @@ input_stream_global_init(Error &error)
assert(plugin->open != nullptr);
const struct config_param *param =
config_find_block(CONF_INPUT, "plugin", plugin->name);
config_find_block(ConfigOption::INPUT, "plugin",
plugin->name);
if (param == nullptr) {
param = ∅
} else if (!param->GetBlockValue("enabled", true))

8
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -564,10 +564,10 @@ input_curl_init(const config_param &param, Error &error)
if (proxy == nullptr) {
/* deprecated proxy configuration */
proxy = config_get_string(CONF_HTTP_PROXY_HOST, nullptr);
proxy_port = config_get_positive(CONF_HTTP_PROXY_PORT, 0);
proxy_user = config_get_string(CONF_HTTP_PROXY_USER, nullptr);
proxy_password = config_get_string(CONF_HTTP_PROXY_PASSWORD,
proxy = config_get_string(ConfigOption::HTTP_PROXY_HOST, nullptr);
proxy_port = config_get_positive(ConfigOption::HTTP_PROXY_PORT, 0);
proxy_user = config_get_string(ConfigOption::HTTP_PROXY_USER, nullptr);
proxy_password = config_get_string(ConfigOption::HTTP_PROXY_PASSWORD,
"");
}