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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/InputInit.cxx
View File

@ -44,8 +44,7 @@ input_plugin_config(const char *plugin_name, GError **error_r)
const struct config_param *param = NULL; const struct config_param *param = NULL;
while ((param = config_get_next_param(CONF_INPUT, param)) != NULL) { while ((param = config_get_next_param(CONF_INPUT, param)) != NULL) {
const char *name = const char *name = param->GetBlockValue("plugin");
config_get_block_string(param, "plugin", NULL);
if (name == NULL) { if (name == NULL) {
g_set_error(error_r, input_quark(), 0, g_set_error(error_r, input_quark(), 0,
"input configuration without 'plugin' name in line %d", "input configuration without 'plugin' name in line %d",
@ -63,6 +62,8 @@ input_plugin_config(const char *plugin_name, GError **error_r)
bool bool
input_stream_global_init(GError **error_r) input_stream_global_init(GError **error_r)
{ {
const config_param empty;
GError *error = NULL; GError *error = NULL;
for (unsigned i = 0; input_plugins[i] != NULL; ++i) { for (unsigned i = 0; input_plugins[i] != NULL; ++i) {
@ -74,16 +75,18 @@ input_stream_global_init(GError **error_r)
const struct config_param *param = const struct config_param *param =
input_plugin_config(plugin->name, &error); input_plugin_config(plugin->name, &error);
if (param == NULL && error != NULL) { if (param == nullptr) {
g_propagate_error(error_r, error); if (error != nullptr) {
return false; g_propagate_error(error_r, error);
} return false;
}
if (!config_get_block_bool(param, "enabled", true)) param = ∅
} else if (!param->GetBlockValue("enabled", true))
/* the plugin is disabled in mpd.conf */ /* the plugin is disabled in mpd.conf */
continue; continue;
if (plugin->init == NULL || plugin->init(param, &error)) if (plugin->init == NULL || plugin->init(*param, &error))
input_plugins_enabled[i] = true; input_plugins_enabled[i] = true;
else { else {
g_propagate_prefixed_error(error_r, error, g_propagate_prefixed_error(error_r, error,

2
src/InputPlugin.hxx
View File

@ -39,7 +39,7 @@ struct input_plugin {
* @return true on success, false if the plugin should be * @return true on success, false if the plugin should be
* disabled * disabled
*/ */
bool (*init)(const struct config_param *param, GError **error_r); bool (*init)(const config_param &param, GError **error_r);
/** /**
* Global deinitialization. Called once before MPD shuts * Global deinitialization. Called once before MPD shuts

11
src/input/CurlInputPlugin.cxx
View File

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

2
src/input/FfmpegInputPlugin.cxx
View File

@ -76,7 +76,7 @@ input_ffmpeg_supported(void)
} }
static bool 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) G_GNUC_UNUSED GError **error_r)
{ {
av_register_all(); av_register_all();