[MPlayer-cvslog] r32555 - trunk/stream/cache2.c
reimar
subversion at mplayerhq.hu
Wed Oct 27 19:52:45 CEST 2010
Author: reimar
Date: Wed Oct 27 19:52:45 2010
New Revision: 32555
Log:
Remove som irrelevant commented-out code.
Modified:
trunk/stream/cache2.c
Modified: trunk/stream/cache2.c
==============================================================================
--- trunk/stream/cache2.c Wed Oct 27 19:47:13 2010 (r32554)
+++ trunk/stream/cache2.c Wed Oct 27 19:52:45 2010 (r32555)
@@ -213,11 +213,9 @@ static int cache_fill(cache_vars_t *s)
// reduce space if needed:
if(space>s->buffer_size-pos) space=s->buffer_size-pos;
-// if(space>32768) space=32768; // limit one-time block size
+ // limit one-time block size
if(space>4*s->sector_size) space=4*s->sector_size;
-// if(s->seek_lock) return 0; // FIXME
-
#if 1
// back+newb+space <= buffer_size
back2=s->buffer_size-(space+newb); // max back size
@@ -226,11 +224,6 @@ static int cache_fill(cache_vars_t *s)
s->min_filepos=read-back; // avoid seeking-back to temp area...
#endif
- // ....
- //printf("Buffer fill: %d bytes of %d\n",space,s->buffer_size);
- //len=stream_fill_buffer(s->stream);
- //memcpy(&s->buffer[pos],s->stream->buffer,len); // avoid this extra copy!
- // ....
len=stream_read(s->stream,&s->buffer[pos],space);
s->eof= !len;
More information about the MPlayer-cvslog
mailing list