diff options
author | wm4 <wm4@nowhere> | 2013-08-02 17:59:43 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-08-02 18:00:38 +0200 |
commit | d1c563c0a9f24e8ed661c29a8718f7fde162a4ff (patch) | |
tree | d8ca65b9ee32ffe5d354a6952193403640b9fa4c /core/m_option.h | |
parent | 878a94d000093d253206cc50e10632d64f8728cb (diff) | |
download | mpv-d1c563c0a9f24e8ed661c29a8718f7fde162a4ff.tar.bz2 mpv-d1c563c0a9f24e8ed661c29a8718f7fde162a4ff.tar.xz |
options: don't make options set during playback file local (e.g. --vf)
Refactor file local options handling: instead of making all options
implicitly file local between loading a file and terminating playback,
explicitly make options file local which are required to be file local.
Or in other words, introduce a M_SETOPT_BACKUP flag, which forces file
local-ness when setting an option, and use this for file local command
line options, per-file config files, and per-protocol/extension/vo/ao
profiles.
In particular, this changes the "vf" input command such that video
filters stay permanent even when going to the next file in the playlist.
The underlying reason for this is that the "vf" command uses the option
setting command. This influences the "af" command as well.
Diffstat (limited to 'core/m_option.h')
-rw-r--r-- | core/m_option.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/core/m_option.h b/core/m_option.h index b237c4b243..89f3caa652 100644 --- a/core/m_option.h +++ b/core/m_option.h @@ -337,11 +337,6 @@ struct m_option { // 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) |