From bfe569b76ebc19263efbf717728a6da7c413cbac Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Sat, 19 Apr 2008 07:45:16 +0300 Subject: 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. --- libvo/w32_common.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libvo/w32_common.c') diff --git a/libvo/w32_common.c b/libvo/w32_common.c index bae8ff3dfe..8fdfc1da24 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -11,6 +11,8 @@ #include "aspect.h" #include "w32_common.h" #include "mp_fifo.h" +// To get "#define vo_ontop global_vo->opts->vo_ontop" etc +#include "old_vo_defines.h" extern int enable_mouse_movements; -- cgit v1.2.3