summaryrefslogtreecommitdiffstats
path: root/stream/cache2.c
diff options
context:
space:
mode:
Diffstat (limited to 'stream/cache2.c')
-rw-r--r--stream/cache2.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/stream/cache2.c b/stream/cache2.c
index 3748e6f2f4..05905a6ded 100644
--- a/stream/cache2.c
+++ b/stream/cache2.c
@@ -60,11 +60,9 @@ static void *ThreadProc(void *s);
#endif
#include "mp_msg.h"
-#include "help_mp.h"
#include "stream.h"
#include "cache2.h"
-extern int use_gui;
typedef struct {
// constats:
@@ -452,7 +450,7 @@ int stream_enable_cache(stream_t *stream,int size,int min,int seek_limit){
mp_msg(MSGT_CACHE,MSGL_V,"CACHE_PRE_INIT: %"PRId64" [%"PRId64"] %"PRId64" pre:%d eof:%d \n",
(int64_t)s->min_filepos,(int64_t)s->read_filepos,(int64_t)s->max_filepos,min,s->eof);
while(s->read_filepos<s->min_filepos || s->max_filepos-s->read_filepos<min){
- mp_msg(MSGT_CACHE,MSGL_STATUS,MSGTR_CacheFill,
+ mp_tmsg(MSGT_CACHE,MSGL_STATUS,"\rCache fill: %5.2f%% (%"PRId64" bytes) ",
100.0*(float)(s->max_filepos-s->read_filepos)/(float)(s->buffer_size),
(int64_t)s->max_filepos-s->read_filepos
);
@@ -471,9 +469,6 @@ err_out:
}
#if FORKED_CACHE
-#ifdef CONFIG_GUI
- use_gui = 0; // mp_msg may not use gui stuff in forked code
-#endif
signal(SIGTERM,exit_sighandler); // kill
cache_mainloop(s);
// make sure forked code never leaves this function