summaryrefslogtreecommitdiffstats
path: root/sub/sub.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-08-07 01:58:43 +0200
committerwm4 <wm4@nowhere>2012-08-07 01:58:43 +0200
commit0268b1a44562ea5310491fbcbb987d5462f42ca5 (patch)
treeb96a42861bdb8733b73615da8fdc88a3f9807f03 /sub/sub.c
parent22872451369fe219990c6280fc0d1c0c0c344b55 (diff)
downloadmpv-0268b1a44562ea5310491fbcbb987d5462f42ca5.tar.bz2
mpv-0268b1a44562ea5310491fbcbb987d5462f42ca5.tar.xz
osd: reset OSD change state even if VO doesn't draw OSD
Commit 168293e0ae6f08 assumed the OSD drawing routines (which have the functions osd_draw_text/_ext as entrypoint) would always be called, and relied on that to reset the change flag. Some VOs, such as vo_null, didn't do this. Pausing could turn into endless framestepping in some cases. Restore the part of the OSD drawing logic that dealt with this. (Alternatively, the VOs could be obliged to always call the OSD drawing routines, even if the VO doesn't actually draw the OSD. But it seems even more messy to rely on that.)
Diffstat (limited to 'sub/sub.c')
-rw-r--r--sub/sub.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/sub/sub.c b/sub/sub.c
index 731bec3565..f88e9869ee 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -393,6 +393,15 @@ void vo_osd_changed(int new_value)
}
}
+void vo_osd_reset_changed(void)
+{
+ mp_osd_obj_t* obj = vo_osd_list;
+ while (obj) {
+ obj->flags = obj->flags & ~OSDFLAG_FORCE_UPDATE;
+ obj = obj->next;
+ }
+}
+
bool vo_osd_has_changed(struct osd_state *osd)
{
mp_osd_obj_t* obj = vo_osd_list;