From 56616b0b013cbeae69555ae95ff577482e82bb1f Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 16 Sep 2016 17:17:32 +0200 Subject: osd: fix OSD getting stuck with --blend-subtitles=yes If --blend-subtitles=yes is given, vo_opengl will call osd_draw() multiple times, once for subtitles, and once for OSD. This meant that the want_redraw flag was reset before the OSD was rendered, which in turn meant that update_osd() was never called. It seems like removing the per-OSD object want_redraw wasn't such a good idea. Fix it by reintroducing such a flag for OSDTYPE_OSD only. Also, the want_redraw flag is now unused, so kill it. Another regression caused by commit 9c9cf125. Fixes #3535. --- sub/osd_state.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'sub/osd_state.h') diff --git a/sub/osd_state.h b/sub/osd_state.h index d054f3d06d..fbccd85e70 100644 --- a/sub/osd_state.h +++ b/sub/osd_state.h @@ -29,9 +29,8 @@ struct osd_object { bool is_sub; // OSDTYPE_OSD + bool osd_changed; char *text; - - // OSDTYPE_OSD struct osd_progbar_state progbar_state; // OSDTYPE_SUB/OSDTYPE_SUB2 @@ -79,6 +78,4 @@ struct osd_state { struct mp_draw_sub_cache *draw_cache; }; -void osd_changed_unlocked(struct osd_state *osd); - #endif -- cgit v1.2.3