options: make cache option always per-file

When playing a network stream, the cache is automatically enabled. We
don't want the cache to stay enabled when playback ends. (For example,
the next file to be played could be a local file, and even if that is
relatively contrieved, we want to do the right thing.)

Introduced the flag M_OPT_LOCAL to force an option to be always file
local. This allows enabling the old mplayer semantics on a per option
basis.

1 files changed, 6 insertions, 5 deletions

diff --git a/m_option.h b/m_option.h
index 57fdc33610..bb5f7da304 100644
--- a/m_option.h
+++ b/m_option.h
@@ -282,13 +282,14 @@ struct m_option {
 // The option is forbidden on the command line.
 #define M_OPT_NOCMD             (1 << 3)
 
-// The option is global in the \ref Config.
-/** It won't be saved on push and the command line parser will set it when
- *  it's parsed (i.e. it won't be set later)
- *  e.g options : -v, -quiet
- */
+// This option can't be set per-file when used with struct m_config.
 #define M_OPT_GLOBAL            (1 << 4)
 
+// This option is always considered per-file when used with struct m_config.
+// When playback of a file ends, the option value will be restored to the value
+// from before playback begin.
+#define M_OPT_LOCAL             (1 << 5)
+
 // The option should be set during command line pre-parsing
 #define M_OPT_PRE_PARSE         (1 << 6)