diff options
Diffstat (limited to 'src/input_init.c')
| -rw-r--r-- | src/input_init.c | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/src/input_init.c b/src/input_init.c index 5f45de5c7..c4d015594 100644 --- a/src/input_init.c +++ b/src/input_init.c @@ -22,9 +22,16 @@ #include "input_plugin.h" #include "input_registry.h" #include "conf.h" +#include "glib_compat.h" #include <string.h> +static inline GQuark +input_quark(void) +{ + return g_quark_from_static_string("input"); +} + /** * Find the "input" configuration block for the specified plugin. * @@ -32,16 +39,19 @@ * @return the configuration block, or NULL if none was configured */ static const struct config_param * -input_plugin_config(const char *plugin_name) +input_plugin_config(const char *plugin_name, GError **error_r) { const struct config_param *param = NULL; while ((param = config_get_next_param(CONF_INPUT, param)) != NULL) { const char *name = config_get_block_string(param, "plugin", NULL); - if (name == NULL) - g_error("input configuration without 'plugin' name in line %d", - param->line); + if (name == NULL) { + g_set_error(error_r, input_quark(), 0, + "input configuration without 'plugin' name in line %d", + param->line); + return NULL; + } if (strcmp(name, plugin_name) == 0) return param; @@ -50,20 +60,35 @@ input_plugin_config(const char *plugin_name) return NULL; } -void input_stream_global_init(void) +bool +input_stream_global_init(GError **error_r) { + GError *error = NULL; + for (unsigned i = 0; input_plugins[i] != NULL; ++i) { const struct input_plugin *plugin = input_plugins[i]; const struct config_param *param = - input_plugin_config(plugin->name); + input_plugin_config(plugin->name, &error); + if (param == NULL && error != NULL) { + g_propagate_error(error_r, error); + return false; + } if (!config_get_block_bool(param, "enabled", true)) /* the plugin is disabled in mpd.conf */ continue; - if (plugin->init == NULL || plugin->init(param)) + if (plugin->init == NULL || plugin->init(param, &error)) input_plugins_enabled[i] = true; + else { + g_propagate_prefixed_error(error_r, error, + "Failed to initialize input plugin '%s': ", + plugin->name); + return false; + } } + + return true; } void input_stream_global_finish(void) |