From cfb350f4f01f28cdd6fa973602bd45681a64cf46 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 2 Mar 2009 23:08:17 +0100 Subject: input: pass config_param to input_plugin.init() Allow input plugins to configure with an "input" block in mpd.conf. Also allow the user to disable a plugin completely. --- src/conf.c | 1 + src/conf.h | 1 + src/input/archive_input_plugin.c | 1 + src/input/curl_input_plugin.c | 3 ++- src/input/file_input_plugin.c | 1 + src/input/mms_input_plugin.c | 1 + src/input_plugin.h | 5 ++++- src/input_stream.c | 44 +++++++++++++++++++++++++++++++++++----- 8 files changed, 50 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/conf.c b/src/conf.c index 2f022411e..a79276185 100644 --- a/src/conf.c +++ b/src/conf.c @@ -214,6 +214,7 @@ void config_global_init(void) registerConfigParam(CONF_METADATA_TO_USE, 0, 0); registerConfigParam(CONF_SAVE_ABSOLUTE_PATHS, 0, 0); registerConfigParam(CONF_DECODER, true, true); + registerConfigParam(CONF_INPUT, true, true); registerConfigParam(CONF_GAPLESS_MP3_PLAYBACK, 0, 0); } diff --git a/src/conf.h b/src/conf.h index 95bdb4d02..e863b9c64 100644 --- a/src/conf.h +++ b/src/conf.h @@ -65,6 +65,7 @@ #define CONF_METADATA_TO_USE "metadata_to_use" #define CONF_SAVE_ABSOLUTE_PATHS "save_absolute_paths_in_playlists" #define CONF_DECODER "decoder" +#define CONF_INPUT "input" #define CONF_GAPLESS_MP3_PLAYBACK "gapless_mp3_playback" #define CONF_BOOL_UNSET -1 diff --git a/src/input/archive_input_plugin.c b/src/input/archive_input_plugin.c index 31f873aa2..68d790828 100644 --- a/src/input/archive_input_plugin.c +++ b/src/input/archive_input_plugin.c @@ -73,5 +73,6 @@ input_archive_open(struct input_stream *is, const char *pathname) } const struct input_plugin input_plugin_archive = { + .name = "archive", .open = input_archive_open, }; diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index a80c67d63..21b7144b8 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -92,7 +92,7 @@ struct input_curl { static struct curl_slist *http_200_aliases; static bool -input_curl_init(void) +input_curl_init(G_GNUC_UNUSED const struct config_param *param) { CURLcode code = curl_global_init(CURL_GLOBAL_ALL); if (code != CURLE_OK) { @@ -954,6 +954,7 @@ input_curl_open(struct input_stream *is, const char *url) } const struct input_plugin input_plugin_curl = { + .name = "curl", .init = input_curl_init, .finish = input_curl_finish, diff --git a/src/input/file_input_plugin.c b/src/input/file_input_plugin.c index c857bbd65..c8a5053f8 100644 --- a/src/input/file_input_plugin.c +++ b/src/input/file_input_plugin.c @@ -121,6 +121,7 @@ input_file_eof(struct input_stream *is) } const struct input_plugin input_plugin_file = { + .name = "file", .open = input_file_open, .close = input_file_close, .read = input_file_read, diff --git a/src/input/mms_input_plugin.c b/src/input/mms_input_plugin.c index d449d058a..168203a28 100644 --- a/src/input/mms_input_plugin.c +++ b/src/input/mms_input_plugin.c @@ -115,6 +115,7 @@ input_mms_seek(G_GNUC_UNUSED struct input_stream *is, } const struct input_plugin input_plugin_mms = { + .name = "mms", .open = input_mms_open, .close = input_mms_close, .buffer = input_mms_buffer, diff --git a/src/input_plugin.h b/src/input_plugin.h index 905596355..6de82653a 100644 --- a/src/input_plugin.h +++ b/src/input_plugin.h @@ -25,16 +25,19 @@ #include #include +struct config_param; struct input_stream; struct input_plugin { + const char *name; + /** * Global initialization. This method is called when MPD starts. * * @return true on success, false if the plugin should be * disabled */ - bool (*init)(void); + bool (*init)(const struct config_param *param); /** * Global deinitialization. Called once before MPD shuts diff --git a/src/input_stream.c b/src/input_stream.c index 8896415bb..e07a3ab52 100644 --- a/src/input_stream.c +++ b/src/input_stream.c @@ -18,6 +18,7 @@ #include "input_plugin.h" #include "config.h" +#include "conf.h" #include "input/file_input_plugin.h" @@ -35,6 +36,7 @@ #include #include +#include static const struct input_plugin *const input_plugins[] = { &input_plugin_file, @@ -54,11 +56,45 @@ static bool input_plugins_enabled[G_N_ELEMENTS(input_plugins)]; static const unsigned num_input_plugins = sizeof(input_plugins) / sizeof(input_plugins[0]); +/** + * Find the "input" configuration block for the specified plugin. + * + * @param plugin_name the name of the input plugin + * @return the configuration block, or NULL if none was configured + */ +static const struct config_param * +input_plugin_config(const char *plugin_name) +{ + 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 (strcmp(name, plugin_name) == 0) + return param; + } + + return NULL; +} + void input_stream_global_init(void) { - for (unsigned i = 0; i < num_input_plugins; ++i) - if (input_plugins[i]->init == NULL || input_plugins[i]->init()) + for (unsigned i = 0; i < num_input_plugins; ++i) { + const struct input_plugin *plugin = input_plugins[i]; + const struct config_param *param = + input_plugin_config(plugin->name); + + if (!config_get_block_bool(param, "enabled", true)) + /* the plugin is disabled in mpd.conf */ + continue; + + if (plugin->init == NULL || plugin->init(param)) input_plugins_enabled[i] = true; + } } void input_stream_global_finish(void) @@ -82,10 +118,8 @@ input_stream_open(struct input_stream *is, const char *url) for (unsigned i = 0; i < num_input_plugins; ++i) { const struct input_plugin *plugin = input_plugins[i]; - if (plugin->open(is, url)) { + if (input_plugins_enabled[i] && plugin->open(is, url)) { assert(is->plugin != NULL); - assert(is->plugin->open == NULL || - is->plugin == plugin); assert(is->plugin->close != NULL); assert(is->plugin->read != NULL); assert(is->plugin->eof != NULL); -- cgit v1.2.3