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

input/rewind: enable the "rewind" wrapper for all non-seekable streams 

Don't limit the "rewind" input plugin to CURL streams.
This commit is contained in:
Max Kellermann 2010-01-04 21:42:11 +01:00
parent 9b9abff972
commit 2f8135ef8b
3 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -586,11 +586,11 @@ INPUT_SRC = \
src/input_init.c \ src/input_init.c \
src/input_registry.c \ src/input_registry.c \
src/input_stream.c \ src/input_stream.c \
src/input/rewind_input_plugin.c \
src/input/file_input_plugin.c src/input/file_input_plugin.c
if ENABLE_CURL if ENABLE_CURL
INPUT_SRC += src/input/curl_input_plugin.c \ INPUT_SRC += src/input/curl_input_plugin.c \
src/input/rewind_input_plugin.c \
src/icy_metadata.c src/icy_metadata.c
endif endif

5
src/input/rewind_input_plugin.c
View File

@ -221,9 +221,8 @@ input_rewind_open(struct input_stream *is)
assert(is != NULL); assert(is != NULL);
assert(is->offset == 0); assert(is->offset == 0);
if (is->plugin != &input_plugin_curl) if (is->seekable)
/* due to limitations in the input_plugin API, we only /* seekable resources don't need this plugin */
(explicitly) support the CURL input plugin */
return is; return is;
c = g_new(struct input_rewind, 1); c = g_new(struct input_rewind, 1);

12
src/input/rewind_input_plugin.h
View File

@ -31,19 +31,7 @@
struct input_stream; struct input_stream;
#ifdef ENABLE_CURL
struct input_stream * struct input_stream *
input_rewind_open(struct input_stream *is); input_rewind_open(struct input_stream *is);
#else
static inline struct input_stream *
input_rewind_open(struct input_stream *is)
{
return is;
}
#endif
#endif #endif