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 /libvo/old_vo_wrapper.c | |
| 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 'libvo/old_vo_wrapper.c')
| -rw-r--r-- | libvo/old_vo_wrapper.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libvo/old_vo_wrapper.c b/libvo/old_vo_wrapper.c index d4af6fcc10..825f6da0ee 100644 --- a/libvo/old_vo_wrapper.c +++ b/libvo/old_vo_wrapper.c @@ -22,8 +22,11 @@ #include "video_out.h" #include "sub.h" +struct vo *global_vo; + int old_vo_preinit(struct vo *vo, const char *arg) { + global_vo = vo; return vo->driver->old_functions->preinit(arg); } |