aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Jansen <mithi@mithi.net>2010-09-28 12:56:47 +0200
committerMax Kellermann <max@duempel.org>2010-09-28 12:56:47 +0200
commite3f4c7b91cb25cc7d233b64de0e55ef2ab0d179b (patch)
tree52d4b45f870696907b3bc7aa732c39221d9f70f9
parent54294366d5fe47aba687fc791967596e31a26864 (diff)
downloadmpd-e3f4c7b91cb25cc7d233b64de0e55ef2ab0d179b.tar.gz
mpd-e3f4c7b91cb25cc7d233b64de0e55ef2ab0d179b.tar.xz
mpd-e3f4c7b91cb25cc7d233b64de0e55ef2ab0d179b.zip
input/rewind: enable for MMS
-rw-r--r--NEWS1
-rw-r--r--src/input/rewind_input_plugin.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 2b6bb2eb3..ff6716a0e 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.15.13 (2010/??/??)
- httpd: fix random data in stream title
* input:
- rewind: update MIME not only once
+ - rewind: enable for MMS
ver 0.15.12 (2010/07/20)
diff --git a/src/input/rewind_input_plugin.c b/src/input/rewind_input_plugin.c
index 335ccf7e1..43f0254c9 100644
--- a/src/input/rewind_input_plugin.c
+++ b/src/input/rewind_input_plugin.c
@@ -20,6 +20,9 @@
#include "config.h"
#include "input/rewind_input_plugin.h"
#include "input/curl_input_plugin.h"
+#ifdef ENABLE_MMS
+#include "input/mms_input_plugin.h"
+#endif
#include "input_plugin.h"
#include "tag.h"
@@ -220,7 +223,11 @@ input_rewind_open(struct input_stream *is)
assert(is != NULL);
assert(is->offset == 0);
- if (is->plugin != &input_plugin_curl)
+ if (is->plugin != &input_plugin_curl
+#ifdef ENABLE_MMS
+ && is->plugin != &input_plugin_mms
+#endif
+ )
/* due to limitations in the input_plugin API, we only
(explicitly) support the CURL input plugin */
return;
@@ -230,7 +237,8 @@ input_rewind_open(struct input_stream *is)
/* move the CURL input stream to c->input */
c->input = *is;
- input_curl_reinit(&c->input);
+ if (is->plugin == &input_plugin_curl)
+ input_curl_reinit(&c->input);
/* convert the existing input_stream pointer to a "rewind"
input stream */