aboutsummaryrefslogtreecommitdiffstats
path: root/src/input
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-03-02 23:08:17 +0100
committerMax Kellermann <max@duempel.org>2009-03-02 23:08:17 +0100
commitcfb350f4f01f28cdd6fa973602bd45681a64cf46 (patch)
treee2614273f1c259ff2d0bf7703057ee9e2ea165df /src/input
parent9a350acf0497acd19e05b77e6aa985552c13a94a (diff)
downloadmpd-cfb350f4f01f28cdd6fa973602bd45681a64cf46.tar.gz
mpd-cfb350f4f01f28cdd6fa973602bd45681a64cf46.tar.xz
mpd-cfb350f4f01f28cdd6fa973602bd45681a64cf46.zip
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.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/archive_input_plugin.c1
-rw-r--r--src/input/curl_input_plugin.c3
-rw-r--r--src/input/file_input_plugin.c1
-rw-r--r--src/input/mms_input_plugin.c1
4 files changed, 5 insertions, 1 deletions
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,