diff options
author | Max Kellermann <max@duempel.org> | 2009-12-29 23:55:40 +0100 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2009-12-29 23:55:40 +0100 |
commit | c88f95a2ea1d089501bed84c085acd7312f7dc2a (patch) | |
tree | a413d715313a8f349889a893141fdbc2fa1bda92 /src/input/curl_input_plugin.c | |
parent | c7d099c75736664867914fd5013a0a844cd23adc (diff) | |
download | mpd-c88f95a2ea1d089501bed84c085acd7312f7dc2a.tar.gz mpd-c88f95a2ea1d089501bed84c085acd7312f7dc2a.tar.xz mpd-c88f95a2ea1d089501bed84c085acd7312f7dc2a.zip |
input/rewind: new input_stream wrapper to allow stream rewinding
This replaces the rewinding buffer code from the CURL input plugin.
It is more generic, and allows rewinding even when the server sends
Icy-Metadata (which would have been too difficult to implement within
the CURL plugin).
This is a rather complex patch for the stable branch (v0.15.x), but it
fixes a serious problem: the "vorbis" decoder plugin was unable to
play streams with Icy-Metadata, because it couldn't rewind the stream
after detecting the codec (Vorbis vs. FLAC).
Diffstat (limited to 'src/input/curl_input_plugin.c')
-rw-r--r-- | src/input/curl_input_plugin.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/input/curl_input_plugin.c b/src/input/curl_input_plugin.c index 95d269ce5..37d721d58 100644 --- a/src/input/curl_input_plugin.c +++ b/src/input/curl_input_plugin.c @@ -732,6 +732,18 @@ input_curl_easy_init(struct input_stream *is) return true; } +void +input_curl_reinit(struct input_stream *is) +{ + struct input_curl *c = is->data; + + assert(is->plugin == &input_plugin_curl); + assert(c->easy != NULL); + + curl_easy_setopt(c->easy, CURLOPT_WRITEHEADER, is); + curl_easy_setopt(c->easy, CURLOPT_WRITEDATA, is); +} + static bool input_curl_send_request(struct input_curl *c) { |