summaryrefslogtreecommitdiffstats
path: root/stream/cache2.c
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-26 18:23:43 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-26 18:23:43 +0000
commitc36de0867fc576ad5fd58fc28bd5fe3322579f36 (patch)
treef2eab7727e5fae4c4ba87d6cbe34ca4f0901e2e2 /stream/cache2.c
parent1e0b9a97fd840c547bc22591ce225f998d0cf3c5 (diff)
downloadmpv-c36de0867fc576ad5fd58fc28bd5fe3322579f36.tar.bz2
mpv-c36de0867fc576ad5fd58fc28bd5fe3322579f36.tar.xz
Retry reading even if we hit eof before.
This allows playing growing files even with a large cache. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31226 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/cache2.c')
-rw-r--r--stream/cache2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/stream/cache2.c b/stream/cache2.c
index e936e47dca..533781104b 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -225,7 +225,7 @@ static int cache_fill(cache_vars_t *s)
//memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
// ....
len=stream_read(s->stream,&s->buffer[pos],space);
- if(!len) s->eof=1;
+ s->eof= !len;
s->max_filepos+=len;
if(pos+len>=s->buffer_size){
@@ -477,7 +477,6 @@ static void *ThreadProc( void *s ){
int cache_stream_fill_buffer(stream_t *s){
int len;
- if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
if(!s->cache_pid) return stream_fill_buffer(s);
// cache_stats(s->cache_data);
@@ -488,6 +487,7 @@ int cache_stream_fill_buffer(stream_t *s){
//printf("cache_stream_fill_buffer->read -> %d\n",len);
if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
+ s->eof=0;
s->buf_pos=0;
s->buf_len=len;
s->pos+=len;