diff options
author | wm4 <wm4@nowhere> | 2013-03-01 11:16:01 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-03-01 11:16:01 +0100 |
commit | d511ef79a09fa9e42479e66f4837daaa68b7255b (patch) | |
tree | 9df1d56baf902583387317af3070152c6de40f0c /video/vfcap.h | |
parent | 6b3d510165201e5600e9ec25c37f33541c03f58a (diff) | |
download | mpv-d511ef79a09fa9e42479e66f4837daaa68b7255b.tar.bz2 mpv-d511ef79a09fa9e42479e66f4837daaa68b7255b.tar.xz |
core: simplify OSD capability handling, remove VFCAP_OSD
VFCAP_OSD was used to determine at runtime whether the VO supports OSD
rendering. This was mostly unused. vo_direct3d had an option to disable
OSD (was supposed to allow to force auto-insertion of vf_ass, but we
removed that anyway). vo_opengl_old could disable OSD rendering when a
very old OpenGL version was detected, and had an option to explicitly
disable it as well.
Remove VFCAP_OSD from everything (and some associated logic). Now the
vo_driver.draw_osd callback can be set to NULL to indicate missing OSD
support (important so that vo_null etc. don't single-step on OSD
redraw), and if OSD support depends on runtime support, the VO's
draw_osd should just do nothing if OSD is not available.
Also, do not access vo->want_redraw directly. Change the want_redraw
reset logic for this purpose, too. (Probably unneeded, vo_flip_page
resets it already.)
Diffstat (limited to 'video/vfcap.h')
-rw-r--r-- | video/vfcap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/video/vfcap.h b/video/vfcap.h index 8758e30ada..f67fcd5496 100644 --- a/video/vfcap.h +++ b/video/vfcap.h @@ -24,8 +24,6 @@ #define VFCAP_CSP_SUPPORTED 0x1 // set, if the given colorspace is supported _without_ conversion #define VFCAP_CSP_SUPPORTED_BY_HW 0x2 -// set if the driver/filter can draw OSD -#define VFCAP_OSD 0x4 // driver/filter can do vertical flip (upside-down) #define VFCAP_FLIP 0x80 |