diff options
author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-19 07:45:16 +0300 |
---|---|---|
committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-23 13:41:06 +0300 |
commit | bfe569b76ebc19263efbf717728a6da7c413cbac (patch) | |
tree | 59bd4aa70aa2fad9d5db0aa0335401d3a93cf2ac /cfg-mplayer.h | |
parent | 6c9d09170d70df6e915b6e98906b7625c0c52c64 (diff) | |
download | mpv-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 'cfg-mplayer.h')
-rw-r--r-- | cfg-mplayer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 49b8ddccd4..9a07979cd1 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -101,8 +101,8 @@ const m_option_t mplayer_opts[]={ STRINGLIST("ao", audio_driver_list, 0), FLAG_ON("fixed-vo", fixed_vo, CONF_GLOBAL), FLAG_OFF("nofixed-vo", fixed_vo, CONF_GLOBAL), - {"ontop", &vo_ontop, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"noontop", &vo_ontop, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + FLAG_ON("ontop", vo_ontop, 0), + FLAG_OFF("noontop", vo_ontop, 0), {"rootwin", &vo_rootwin, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"border", &vo_border, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"noborder", &vo_border, CONF_TYPE_FLAG, 0, 1, 0, NULL}, |