mpv/libvo/old_vo_defines.h

#ifndef MPLAYER_OLD_VO_DEFINES_H
#define MPLAYER_OLD_VO_DEFINES_H

#include "options.h"
#include "video_out.h"
#include "old_vo_wrapper.h"

// Triggers more defines in x11_common.h
#define IS_OLD_VO 1

#define vo_ontop global_vo->opts->vo_ontop
#define vo_config_count global_vo->config_count
#define vo_dx global_vo->dx
#define vo_dy global_vo->dy
#define vo_dwidth global_vo->dwidth
#define vo_dheight global_vo->dheight
#define vo_dbpp global_vo->opts->vo_dbpp
#define vo_screenwidth global_vo->opts->vo_screenwidth
#define vo_screenheight global_vo->opts->vo_screenheight
#define vidmode global_vo->opts->vidmode
#define movie_aspect global_vo->opts->movie_aspect

#define calc_src_dst_rects(...) calc_src_dst_rects(global_vo, __VA_ARGS__)
#endif
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. 2008-04-19 04:45:16 +00:00			`#ifndef MPLAYER_OLD_VO_DEFINES_H`
			`#define MPLAYER_OLD_VO_DEFINES_H`

			`#include "options.h"`
			`#include "video_out.h"`
			`#include "old_vo_wrapper.h"`

			`// Triggers more defines in x11_common.h`
			`#define IS_OLD_VO 1`

			`#define vo_ontop global_vo->opts->vo_ontop`
Move global vo_config_count to vo struct Remove the global and Add a corresponding field to the vo struct, plus another which tells whether the LAST config call was successful.The latter value which tells whether the VO should be properly configured at the moment seems a better match for the semantics actually needed in most places where the old value was used. The 'count' field with the old semantics is not currently used by anything, but I'm leaving it there for vo drivers which would need those semantics if converted to use the struct. Existing uses of the global outside old vo drivers are either converted to use the struct field or moved inside the vo_xyz() calls (instead of "if (vo_config_count) vo_flip_page(..." just call vo_flip_page which will now do nothing if not configured). The removal of the check in mpcommon.c/update_subtitles() is less trivial than the others, but I think it shouldn't cause problems. 2008-04-18 03:28:47 +00:00			`#define vo_config_count global_vo->config_count`
Move vo_dx,vo_dy,vo_dwidth,vo_dheight to vo struct 2008-04-20 20:29:28 +00:00			`#define vo_dx global_vo->dx`
			`#define vo_dy global_vo->dy`
			`#define vo_dwidth global_vo->dwidth`
			`#define vo_dheight global_vo->dheight`
Move vo_dbpp to options struct 2008-04-20 21:37:12 +00:00			`#define vo_dbpp global_vo->opts->vo_dbpp`
Move vo_screenwidth,vo_screenheight to options struct 2008-04-20 23:18:28 +00:00			`#define vo_screenwidth global_vo->opts->vo_screenwidth`
			`#define vo_screenheight global_vo->opts->vo_screenheight`
Move vidmode to options struct 2008-04-24 04:01:53 +00:00			`#define vidmode global_vo->opts->vidmode`
Move movie_aspect to options struct 2008-04-24 04:36:43 +00:00			`#define movie_aspect global_vo->opts->movie_aspect`
Merge svn changes up to r28549 2009-02-13 01:52:51 +00:00
			`#define calc_src_dst_rects(...) calc_src_dst_rects(global_vo, __VA_ARGS__)`
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. 2008-04-19 04:45:16 +00:00			`#endif`