summaryrefslogtreecommitdiffstats
path: root/video/out/vo_x11.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-03-01 11:16:01 +0100
committerwm4 <wm4@nowhere>2013-03-01 11:16:01 +0100
commitd511ef79a09fa9e42479e66f4837daaa68b7255b (patch)
tree9df1d56baf902583387317af3070152c6de40f0c /video/out/vo_x11.c
parent6b3d510165201e5600e9ec25c37f33541c03f58a (diff)
downloadmpv-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/out/vo_x11.c')
-rw-r--r--video/out/vo_x11.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c
index 0ab3c9ebcb..34c23523ef 100644
--- a/video/out/vo_x11.c
+++ b/video/out/vo_x11.c
@@ -610,9 +610,9 @@ static int query_format(struct vo *vo, uint32_t format)
if (fmt2Xfmt[n].mpfmt == format) {
if (IMGFMT_RGB_DEPTH(format) == p->ximage_depth) {
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW |
- VFCAP_OSD | VFCAP_FLIP;
+ VFCAP_FLIP;
} else {
- return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_FLIP;
+ return VFCAP_CSP_SUPPORTED | VFCAP_FLIP;
}
}
}
@@ -620,7 +620,7 @@ static int query_format(struct vo *vo, uint32_t format)
switch (format) {
case IMGFMT_420P:
- return VFCAP_CSP_SUPPORTED | VFCAP_OSD;
+ return VFCAP_CSP_SUPPORTED;
}
return 0;
}