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

InputPlugin: pass config_param reference

Browse Source
This commit is contained in:
Max Kellermann
2013-08-04 13:47:48 +02:00
parent a0beb5fa26
commit bf6ed643e0
4 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/input/CurlInputPlugin.cxx
View File

@@ -614,7 +614,7 @@ CurlSockets::DispatchSockets()
*/
static bool
input_curl_init(const struct config_param *param,
input_curl_init(const config_param &param,
G_GNUC_UNUSED GError **error_r)
{
CURLcode code = curl_global_init(CURL_GLOBAL_ALL);
@@ -627,11 +627,10 @@ input_curl_init(const struct config_param *param,
http_200_aliases = curl_slist_append(http_200_aliases, "ICY 200 OK");
proxy = config_get_block_string(param, "proxy", NULL);
proxy_port = config_get_block_unsigned(param, "proxy_port", 0);
proxy_user = config_get_block_string(param, "proxy_user", NULL);
proxy_password = config_get_block_string(param, "proxy_password",
NULL);
proxy = param.GetBlockValue("proxy");
proxy_port = param.GetBlockValue("proxy_port", 0u);
proxy_user = param.GetBlockValue("proxy_user");
proxy_password = param.GetBlockValue("proxy_password");
if (proxy == NULL) {
/* deprecated proxy configuration */

2
src/input/FfmpegInputPlugin.cxx
View File

@@ -76,7 +76,7 @@ input_ffmpeg_supported(void)
}
static bool
input_ffmpeg_init(G_GNUC_UNUSED const struct config_param *param,
input_ffmpeg_init(gcc_unused const config_param &param,
G_GNUC_UNUSED GError **error_r)
{
av_register_all();