summaryrefslogtreecommitdiffstats
path: root/sub/sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-21 14:58:46 +0200
committerwm4 <wm4@nowhere>2012-10-24 21:56:34 +0200
commit0c49ddc818fee8059d764f7fbd25820584f335a3 (patch)
tree156cc35c4c38aabbc886baadd89fea8202d21381 /sub/sub.c
parent796e5638ac6bd5e13e0f69e2b9557ba0af1718cd (diff)
downloadmpv-0c49ddc818fee8059d764f7fbd25820584f335a3.tar.bz2
mpv-0c49ddc818fee8059d764f7fbd25820584f335a3.tar.xz
sub: simplify OSD redrawing logic
Normally, we can redraw the OSD any time. But some drivers don't support OSD redrawing (vo_null etc.), or only "sometimes" (vo_xv). For that, some additional logic is needed. Simplify that logic. This might also fix subtle bugs with the OSD not updating or endless frame stepping in unforseen corner cases. Do this by adding a new flag, which tells whether the OSD should be redrawn. Remove some minor code duplication.
Diffstat (limited to 'sub/sub.c')
-rw-r--r--sub/sub.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/sub/sub.c b/sub/sub.c
index 5a39fbdf60..8281081334 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -280,21 +280,7 @@ void vo_osd_changed(int new_value)
if (osd->objs[n]->type == new_value)
osd->objs[n]->force_redraw = true;
}
-}
-
-bool osd_has_changed(struct osd_state *osd)
-{
- for (int n = 0; n < MAX_OSD_PARTS; n++) {
- if (osd->objs[n]->force_redraw)
- return true;
- }
- return false;
-}
-
-void osd_reset_changed(struct osd_state *osd)
-{
- for (int n = 0; n < MAX_OSD_PARTS; n++)
- osd->objs[n]->force_redraw = false;
+ osd->want_redraw = true;
}
bool sub_bitmaps_bb(struct sub_bitmaps *imgs, int *x1, int *y1,