summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-06-15 20:46:57 +0200
committerwm4 <wm4@nowhere>2014-06-15 20:53:15 +0200
commit716285782d5e4b264e18e253e9d58980183c76c6 (patch)
treeb03e6e0ead71828f9d68bdebe777a808bee5d26f /sub
parentd88aca6fb2474617136b09c2f281860d6a0a1a38 (diff)
downloadmpv-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')
-rw-r--r--sub/osd.c15
-rw-r--r--sub/osd.h3
-rw-r--r--sub/osd_state.h2
3 files changed, 0 insertions, 20 deletions
diff --git a/sub/osd.c b/sub/osd.c
index 8b19428e5d..28a98892ce 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -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,
diff --git a/sub/osd.h b/sub/osd.h
index d79f55ae3d..2a5bf71b05 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -149,9 +149,6 @@ void osd_free(struct osd_state *osd);
bool osd_query_and_reset_want_redraw(struct osd_state *osd);
-double osd_get_vo_pts(struct osd_state *osd);
-void osd_set_vo_pts(struct osd_state *osd, double vo_pts);
-
void osd_set_text(struct osd_state *osd, int obj, const char *text);
struct osd_sub_state {
diff --git a/sub/osd_state.h b/sub/osd_state.h
index 55e484e3e0..01546d7c6f 100644
--- a/sub/osd_state.h
+++ b/sub/osd_state.h
@@ -52,8 +52,6 @@ struct osd_state {
struct osd_object *objs[MAX_OSD_PARTS];
- double vo_pts;
-
bool render_subs_in_filter;
bool want_redraw;