[MPlayer-cvslog] CVS: main cfg-common.h, 1.146, 1.147 mencoder.c, 1.302, 1.303 mplayer.c, 1.857, 1.858

[Ivan Kalvachev CVS]

CVS change done by Ivan Kalvachev CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv4340

Modified Files:
	cfg-common.h mencoder.c mplayer.c 
Log Message:
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill


Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- cfg-common.h	17 Jul 2005 19:40:05 -0000	1.146
+++ cfg-common.h	31 Jul 2005 00:26:04 -0000	1.147
@@ -16,7 +16,7 @@
 	{"cache", &stream_cache_size, CONF_TYPE_INT, CONF_RANGE, 32, 1048576, NULL},
 	{"nocache", &stream_cache_size, CONF_TYPE_FLAG, 0, 1, 0, NULL},
 	{"cache-min", &stream_cache_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
-	{"cache-prefill", &stream_cache_prefill_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
+	{"cache-seek-min", &stream_cache_seek_min_percent, CONF_TYPE_FLOAT, CONF_RANGE, 0, 99, NULL},
 #else
 	{"cache", "MPlayer was compiled without cache2 support.\n", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
 #endif

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -r1.302 -r1.303
--- mencoder.c	23 Jul 2005 06:51:35 -0000	1.302
+++ mencoder.c	31 Jul 2005 00:26:04 -0000	1.303
@@ -98,7 +98,7 @@
 extern int cache_fill_status;
 
 float stream_cache_min_percent=20.0;
-float stream_cache_prefill_percent=5.0;
+float stream_cache_seek_min_percent=50.0;
 #else
 #define cache_fill_status 0
 #endif

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -r1.857 -r1.858
--- mplayer.c	24 Jul 2005 12:56:07 -0000	1.857
+++ mplayer.c	31 Jul 2005 00:26:04 -0000	1.858
@@ -266,7 +266,7 @@
 extern int cache_fill_status;
 
 float stream_cache_min_percent=20.0;
-float stream_cache_prefill_percent=5.0;
+float stream_cache_seek_min_percent=50.0;
 #else
 #define cache_fill_status 0
 #endif
@@ -1640,7 +1640,9 @@
 #endif
 if(stream_cache_size>0){
   current_module="enable_cache";
-  if(!stream_enable_cache(stream,stream_cache_size*1024,stream_cache_size*1024*(stream_cache_min_percent / 100.0),stream_cache_size*1024*(stream_cache_prefill_percent / 100.0)))
+  if(!stream_enable_cache(stream,stream_cache_size*1024,
+                          stream_cache_size*1024*(stream_cache_min_percent / 100.0),
+                          stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0)))
     if((eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file;
 }