diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2012-11-17 19:12:13 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-12-03 21:08:51 +0100 |
| commit | 2d58234c86e59298de52fec12d1eb59086d68763 (patch) | |
| tree | d11ec050f30e1fa47cbf30475e6d84adf8080468 /core/cfg-mplayer.h | |
| parent | c082240c62cb8855e55c0dbe88b8591458599ce9 (diff) | |
| download | mpv-2d58234c86e59298de52fec12d1eb59086d68763.tar.bz2 mpv-2d58234c86e59298de52fec12d1eb59086d68763.tar.xz | |
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).
Diffstat (limited to 'core/cfg-mplayer.h')
| -rw-r--r-- | core/cfg-mplayer.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/cfg-mplayer.h b/core/cfg-mplayer.h index 23b937f91a..b1c693a5a9 100644 --- a/core/cfg-mplayer.h +++ b/core/cfg-mplayer.h @@ -324,8 +324,7 @@ const m_option_t common_opts[] = { // ------------------------- stream options -------------------- #ifdef CONFIG_STREAM_CACHE - OPT_INTRANGE("cache", stream_cache_size, M_OPT_LOCAL, 32, 0x7fffffff, - OPTDEF_INT(-1)), + OPT_INTRANGE("cache", stream_cache_size, 0, 32, 0x7fffffff, OPTDEF_INT(-1)), OPT_FLAG_CONSTANTS("no-cache", stream_cache_size, 0, -1, 0), OPT_FLOATRANGE("cache-min", stream_cache_min_percent, 0, 0, 99), |