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/out/vo_null.c | |
| 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/out/vo_null.c')
| -rw-r--r-- | video/out/vo_null.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/video/out/vo_null.c b/video/out/vo_null.c index c1e931f806..993fcb606c 100644 --- a/video/out/vo_null.c +++ b/video/out/vo_null.c @@ -34,10 +34,6 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) { } -static void draw_osd(struct vo *vo, struct osd_state *osd) -{ -} - static void flip_page(struct vo *vo) { } @@ -90,7 +86,6 @@ const struct vo_driver video_out_null = { .config = config, .control = control, .draw_image = draw_image, - .draw_osd = draw_osd, .flip_page = flip_page, .check_events = check_events, .uninit = uninit, |