cache: refactor how cache enabling is done

Code enabling the cache by default for network streams did that by
modifying the value of the "cache" option. This wasn't sane, as
multiple streams may be created and all share the same options. Change
the code to not modify options but store data in the stream instance
instead.

Conflicts:
	core/mplayer.c
	demux/demux.c
	stream/cache2.c
	stream/network.c
	stream/network.h
	stream/pnm.c
	stream/stream.c
	stream/stream_rtp.c

Merged from mplayer2 commit e26070. Note that this doesn't solve any
actual bug, as the playlist crashing bug has been fixed before.

Since the global cache size option value is not overwritten anymore, the
option doesn't need to be restored on end of playback (M_OPT_LOCAL).

1 files changed, 0 insertions, 16 deletions

diff --git a/stream/network.c b/stream/network.c
index fb432d47c0..56e5a1b5e1 100644
--- a/stream/network.c
+++ b/stream/network.c
@@ -461,19 +461,3 @@ int
 nop_streaming_seek( int fd, int64_t pos, streaming_ctrl_t *stream_ctrl ) {
 	return -1;
 }
-
-
-void fixup_network_stream_cache(stream_t *stream) {
-  struct MPOpts *opts = stream->opts;
-  if(!opts)
-    return;
-  if(stream->streaming_ctrl->buffering) {
-    if(opts->stream_cache_size<0) {
-      // cache option not set, will use our computed value.
-      // buffer in KBytes, *5 because the prefill is 20% of the buffer.
-      opts->stream_cache_size = (stream->streaming_ctrl->prebuffer_size/1024)*5;
-      if( opts->stream_cache_size<64 ) opts->stream_cache_size = 64;	// 16KBytes min buffer
-    }
-    mp_tmsg(MSGT_NETWORK,MSGL_INFO,"Cache size set to %d KBytes\n", opts->stream_cache_size);
-  }
-}