summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/cache2.c11
-rw-r--r--stream/cache2.h3
2 files changed, 9 insertions, 5 deletions
diff --git a/stream/cache2.c b/stream/cache2.c
index 9e87670752..9e4bea35b4 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -95,8 +95,6 @@ typedef struct {
static int min_fill=0;
-int cache_fill_status=0;
-
static void cache_wakeup(stream_t *s)
{
#if FORKED_CACHE
@@ -161,7 +159,6 @@ static int cache_read(cache_vars_t *s, unsigned char *buf, int size)
total+=len;
}
- cache_fill_status=(s->max_filepos-s->read_filepos)/(s->buffer_size / 100);
return total;
}
@@ -511,6 +508,14 @@ int cache_stream_fill_buffer(stream_t *s){
}
+int cache_fill_status(stream_t *s) {
+ cache_vars_t *cv;
+ if (!s || !s->cache_data)
+ return -1;
+ cv = s->cache_data;
+ return (cv->max_filepos-cv->read_filepos)/(cv->buffer_size / 100);
+}
+
int cache_stream_seek_long(stream_t *stream,off_t pos){
cache_vars_t* s;
off_t newpos;
diff --git a/stream/cache2.h b/stream/cache2.h
index 2e6a4e0dbb..9c98193f0c 100644
--- a/stream/cache2.h
+++ b/stream/cache2.h
@@ -21,9 +21,8 @@
#include "stream.h"
-extern int cache_fill_status;
-
void cache_uninit(stream_t *s);
int cache_do_control(stream_t *stream, int cmd, void *arg);
+int cache_fill_status(stream_t *s);
#endif /* MPLAYER_CACHE2_H */