aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-10-27 17:52:45 +0000
committerGravatar Uoti Urpala <uau@glyph.nonexistent.invalid>2010-11-07 21:45:41 +0200
commitc6fb4e2aa2f5a16aaa35411201c600c8ae801c38 (patch)
treef50dbe7e588b06bb111ab5b447349ee5cd73bb4a
parent00f82c63b071af759a5a505f5bc30e01257a7e87 (diff)
cosmetics: cache2.c: Remove some irrelevant commented-out code
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32555 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--stream/cache2.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/stream/cache2.c b/stream/cache2.c
index c4514243e1..2b0b8d739d 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -212,11 +212,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
@@ -225,11 +223,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;