diff options
author | wm4 <wm4@nowhere> | 2014-06-15 20:46:57 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-06-15 20:53:15 +0200 |
commit | 716285782d5e4b264e18e253e9d58980183c76c6 (patch) | |
tree | b03e6e0ead71828f9d68bdebe777a808bee5d26f /sub/osd.c | |
parent | d88aca6fb2474617136b09c2f281860d6a0a1a38 (diff) | |
download | mpv-716285782d5e4b264e18e253e9d58980183c76c6.tar.bz2 mpv-716285782d5e4b264e18e253e9d58980183c76c6.tar.xz |
video/out: change aspects of OSD handling
Let the VOs draw the OSD on their own, instead of making OSD drawing a
separate VO driver call. Further, let it be the VOs responsibility to
request subtitles with the correct PTS. We also basically allow the VO
to request OSD/subtitles at any time.
OSX changes untested.
Diffstat (limited to 'sub/osd.c')
-rw-r--r-- | sub/osd.c | 15 |
1 files changed, 0 insertions, 15 deletions
@@ -423,21 +423,6 @@ bool osd_query_and_reset_want_redraw(struct osd_state *osd) return r; } -double osd_get_vo_pts(struct osd_state *osd) -{ - pthread_mutex_lock(&osd->lock); - double r = osd->vo_pts; - pthread_mutex_unlock(&osd->lock); - return r; -} - -void osd_set_vo_pts(struct osd_state *osd, double vo_pts) -{ - pthread_mutex_lock(&osd->lock); - osd->vo_pts = vo_pts; - pthread_mutex_unlock(&osd->lock); -} - // Scale factor to translate OSD coordinates to what the obj uses internally. // osd_coordinates * (sw, sh) = obj_coordinates void osd_object_get_scale_factor(struct osd_state *osd, int obj, |