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

Fix and use filter_configured_new()

Browse Source
This commit is contained in:
Albin Eldstål-Damlin
2009-12-14 21:59:32 +01:00
committed by Max Kellermann
parent 69391dadda
commit 940e66bb89
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/filter_config.c
View File

@@ -88,8 +88,6 @@ filter_chain_parse(struct filter *chain, const char *spec, GError **error_r)
// Add each name to the filter chain by instantiating an actual filter // Add each name to the filter chain by instantiating an actual filter
char **template_names = tokens; char **template_names = tokens;
while (*template_names != NULL) { while (*template_names != NULL) {
const char *plugin_name;
const struct filter_plugin *fp;
struct filter *f; struct filter *f;
const struct config_param *cfg; const struct config_param *cfg;
@@ -102,29 +100,10 @@ filter_chain_parse(struct filter *chain, const char *spec, GError **error_r)
break; break;
} }
// Figure out what kind of a plugin that is
plugin_name = config_get_block_string(cfg, "plugin", NULL);
if (plugin_name == NULL) {
g_set_error(error_r, filter_quark(), 1,
"filter configuration without 'plugin' at line %d",
cfg->line);
break;
}
// Instantiate one of those filter plugins with the template name as a hint // Instantiate one of those filter plugins with the template name as a hint
fp = filter_plugin_by_name(plugin_name); f = filter_configured_new(cfg, error_r);
if (fp == NULL) {
g_set_error(error_r, filter_quark(), 2,
"filter plugin not found: %s",
plugin_name);
break;
}
f = filter_new(fp, cfg, NULL);
if (f == NULL) { if (f == NULL) {
g_set_error(error_r, filter_quark(), 3, // The error has already been set, just stop.
"filter plugin initialization failed: %s",
plugin_name);
break; break;
} }

8
src/filter_plugin.c
View File

@@ -49,14 +49,18 @@ filter_configured_new(const struct config_param *param, GError **error_r)
assert(error_r == NULL || *error_r == NULL); assert(error_r == NULL || *error_r == NULL);
plugin_name = config_get_block_string(param, "plugin", NULL); plugin_name = config_get_block_string(param, "plugin", NULL);
if (plugin_name == NULL) if (plugin_name == NULL) {
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"No filter plugin specified"); "No filter plugin specified");
return NULL;
}
plugin = filter_plugin_by_name(plugin_name); plugin = filter_plugin_by_name(plugin_name);
if (plugin == NULL) if (plugin == NULL) {
g_set_error(error_r, config_quark(), 0, g_set_error(error_r, config_quark(), 0,
"No such filter plugin: %s", plugin_name); "No such filter plugin: %s", plugin_name);
return NULL;
}
return filter_new(plugin, param, error_r); return filter_new(plugin, param, error_r);
} }