From 4e28b4bc9ed8e29daf3570596cc7a4c5325e8039 Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 23 Jan 2010 12:13:28 +0000 Subject: Change code to allow playing a stream even if enabling the cache failed while still handling it when the user aborts the cache fill. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30402 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mplayer.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mplayer.c') diff --git a/mplayer.c b/mplayer.c index da0ebb5671..1eacaaf085 100644 --- a/mplayer.c +++ b/mplayer.c @@ -3281,10 +3281,12 @@ if(mpctx->stream->type==STREAMTYPE_DVDNAV){ // CACHE2: initial prefill: 20% later: 5% (should be set by -cacheopts) goto_enable_cache: if(stream_cache_size>0){ + int res; current_module="enable_cache"; - if(!stream_enable_cache(mpctx->stream,stream_cache_size*1024, + res = stream_enable_cache(mpctx->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))) + stream_cache_size*1024*(stream_cache_seek_min_percent / 100.0)); + if(res == 0) if((mpctx->eof = libmpdemux_was_interrupted(PT_NEXT_ENTRY))) goto goto_next_file; } -- cgit v1.2.3