summaryrefslogtreecommitdiffstats
path: root/options
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-20 01:17:29 +0200
committerwm4 <wm4@nowhere>2016-09-20 01:25:10 +0200
commitb6ba87af4bf51e8539fe97307426e1706071c949 (patch)
tree429e2db39a716fba72642ddce497ebf761d1bb33 /options
parentfb67db8b72a329fd017409338d6742c773ce85bf (diff)
downloadmpv-b6ba87af4bf51e8539fe97307426e1706071c949.tar.bz2
mpv-b6ba87af4bf51e8539fe97307426e1706071c949.tar.xz
m_option: resort M_OPT_ flag values
Remove the gaps that have been added over time.
Diffstat (limited to 'options')
-rw-r--r--options/m_option.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/options/m_option.h b/options/m_option.h
index 20b671df4e..e0f8979a66 100644
--- a/options/m_option.h
+++ b/options/m_option.h
@@ -367,26 +367,26 @@ struct m_option {
// even if the settings don't get effective immediately). Note that an option
// might still change even if this is set, e.g. via properties or per-file
// options.
-#define M_OPT_FIXED (1 << 5)
+#define M_OPT_FIXED (1 << 3)
// The option should be set during command line pre-parsing
-#define M_OPT_PRE_PARSE (1 << 6)
+#define M_OPT_PRE_PARSE (1 << 4)
// The option expects a file name (or a list of file names)
-#define M_OPT_FILE (1 << 11)
+#define M_OPT_FILE (1 << 5)
// Do not add as property.
-#define M_OPT_NOPROP (1 << 13)
+#define M_OPT_NOPROP (1 << 6)
// The following are also part of the M_OPT_* flags, and are used to update
// certain groups of options.
-#define UPDATE_OPT_FIRST (1 << 14)
-#define UPDATE_TERM (1 << 14) // terminal options
-#define UPDATE_RENDERER (1 << 15) // mainly vo_opengl options
-#define UPDATE_VIDEOPOS (1 << 16) // video position (panscan etc.)
-#define UPDATE_OSD (1 << 17) // related to OSD rendering
-#define UPDATE_BUILTIN_SCRIPTS (1 << 18) // osc/ytdl
-#define UPDATE_OPT_LAST (1 << 18)
+#define UPDATE_OPT_FIRST (1 << 7)
+#define UPDATE_TERM (1 << 7) // terminal options
+#define UPDATE_RENDERER (1 << 8) // mainly vo_opengl options
+#define UPDATE_VIDEOPOS (1 << 9) // video position (panscan etc.)
+#define UPDATE_OSD (1 << 10) // related to OSD rendering
+#define UPDATE_BUILTIN_SCRIPTS (1 << 11) // osc/ytdl
+#define UPDATE_OPT_LAST (1 << 11)
// All bits between _FIRST and _LAST (inclusive)
#define UPDATE_OPTS_MASK \