summaryrefslogtreecommitdiffstats
path: root/stream/stream_file.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-07 20:49:15 +0200
committerwm4 <wm4@nowhere>2013-07-07 21:10:44 +0200
commitc4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2 (patch)
tree31ae282e119a8de906997afb6ab4d6b5f3ea264d /stream/stream_file.c
parentdbf2a6f7d0a9ae09bac024cf3ad4e7b27d303cb6 (diff)
downloadmpv-c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2.tar.bz2
mpv-c4f83ac6e93ec9ff2fe97b3f5c6fccc9751fa3e2.tar.xz
stream: remove weird STREAMTYPE_STREAM special handling
This was an old leftover from an earlier cleanup (which happened in 2003), and which used "special" stuff for streams that could be only forward-seeked. Also, don't add mode flags to s->flags; they're supposed to be in s->mode instead.
Diffstat (limited to 'stream/stream_file.c')
-rw-r--r--stream/stream_file.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 5797aef59f..924eb31dad 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -191,14 +191,13 @@ static int open_f(stream_t *stream,int mode, void* opts, int* file_format) {
if(f==0)
len = -1;
#endif
- if(len == -1) {
- if(mode == STREAM_READ) stream->seek = seek_forward;
- stream->type = STREAMTYPE_STREAM; // Must be move to STREAMTYPE_FILE
- stream->flags |= MP_STREAM_SEEK_FW;
+ stream->type = STREAMTYPE_FILE;
+ if(len == -1 && mode == STREAM_READ) {
+ stream->seek = seek_forward;
+ stream->flags = MP_STREAM_SEEK_FW;
} else if(len >= 0) {
stream->seek = seek;
stream->end_pos = len;
- stream->type = STREAMTYPE_FILE;
}
mp_msg(MSGT_OPEN,MSGL_V,"[file] File size is %"PRId64" bytes\n", (int64_t)len);