summaryrefslogtreecommitdiffstats
path: root/command.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-19 07:45:16 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-23 13:41:06 +0300
commitbfe569b76ebc19263efbf717728a6da7c413cbac (patch)
tree59bd4aa70aa2fad9d5db0aa0335401d3a93cf2ac /command.c
parent6c9d09170d70df6e915b6e98906b7625c0c52c64 (diff)
downloadmpv-bfe569b76ebc19263efbf717728a6da7c413cbac.tar.bz2
mpv-bfe569b76ebc19263efbf717728a6da7c413cbac.tar.xz
Move vo_ontop to options struct
Add a 'struct vo *vo' argument to the x11_common.c functions that access the variable so it's available as vo->opts->vo_ontop. To keep VOs using the old API working create a global vo variable that is set to the currently used old vo. "vo_ontop" will be #defined to "global_vo->opts->vo_ontop", and x11_common.h will add defines like the following when it is included by old VOs: #define vo_x11_ontop() vo_x11_ontop(global_vo) so that they will call the function according to the new declaration.
Diffstat (limited to 'command.c')
-rw-r--r--command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/command.c b/command.c
index 1a7fd635da..3f3c25edf1 100644
--- a/command.c
+++ b/command.c
@@ -1076,8 +1076,8 @@ static int mp_property_vo_flag(m_option_t * prop, int action, void *arg,
static int mp_property_ontop(m_option_t * prop, int action, void *arg,
MPContext * mpctx)
{
- return mp_property_vo_flag(prop, action, arg, VOCTRL_ONTOP, &vo_ontop,
- mpctx);
+ return mp_property_vo_flag(prop, action, arg, VOCTRL_ONTOP,
+ &mpctx->opts.vo_ontop, mpctx);
}
/// Display in the root window (RW)