summaryrefslogtreecommitdiffstats
path: root/core/mp_core.h
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-02-20 23:05:02 +0100
committerwm4 <wm4@nowhere>2013-02-20 23:43:15 +0100
commit68daee220c305220bfeb8f4f473b981b2d34af70 (patch)
treef2147659ae544c35b3b2ea309a61a03aa504d45f /core/mp_core.h
parentbad027277c8106e1f0176d801d6752a4b18df8e6 (diff)
downloadmpv-68daee220c305220bfeb8f4f473b981b2d34af70.tar.bz2
mpv-68daee220c305220bfeb8f4f473b981b2d34af70.tar.xz
osd: prevent osd bar from sticking around on seeks
This was supposed to be fixed in f897138, but there's another corner case. Basically, set_osd_function() reset the OSD time, which is not nice at all and breaks the logic of letting OSD elements disappear when they're not wanted anymore. Fix this by adding a separate timer for this. Additionally, make sure the OSD bar is _really_ always updated when visible. Also, redraw the OSD only if the OSD bar actually changes to prevent redrawing too often (every vo_osd_changed() will flag that the OSD should be redrawn, even if nothing changes).
Diffstat (limited to 'core/mp_core.h')
-rw-r--r--core/mp_core.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/mp_core.h b/core/mp_core.h
index 97aeb0d00e..c9c6a57487 100644
--- a/core/mp_core.h
+++ b/core/mp_core.h
@@ -127,8 +127,9 @@ typedef struct MPContext {
subtitle subs; // subtitle list used when reading subtitles from demuxer
int add_osd_seek_info; // bitfield of enum mp_osd_seek_info
- unsigned int osd_visible;
+ unsigned int osd_visible; // for the osd bar only
int osd_function;
+ unsigned int osd_function_visible;
struct playlist *playlist;
char *filename; // currently playing file