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.
This commit is contained in:
wm4
2013-07-07 20:49:15 +02:00
parent dbf2a6f7d0
commit c4f83ac6e9
6 changed files with 27 additions and 50 deletions

View File

@@ -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);