diff options
Diffstat (limited to 'sub')
-rw-r--r-- | sub/osd.c | 11 | ||||
-rw-r--r-- | sub/osd.h | 8 | ||||
-rw-r--r-- | sub/osd_state.h | 3 |
3 files changed, 0 insertions, 22 deletions
@@ -224,14 +224,6 @@ void osd_set_external2(struct osd_state *osd, struct sub_bitmaps *imgs) pthread_mutex_unlock(&osd->lock); } -void osd_set_nav_highlight(struct osd_state *osd, void *priv) -{ - pthread_mutex_lock(&osd->lock); - osd->objs[OSDTYPE_NAV_HIGHLIGHT]->highlight_priv = priv; - osd_changed_unlocked(osd, OSDTYPE_NAV_HIGHLIGHT); - pthread_mutex_unlock(&osd->lock); -} - static void render_object(struct osd_state *osd, struct osd_object *obj, struct mp_osd_res res, double video_pts, const bool sub_formats[SUBBITMAP_COUNT], @@ -265,9 +257,6 @@ static void render_object(struct osd_state *osd, struct osd_object *obj, *out_imgs = *obj->external2; obj->external2->change_id = 0; } - } else if (obj->type == OSDTYPE_NAV_HIGHLIGHT) { - if (obj->highlight_priv) - mp_nav_get_highlight(obj->highlight_priv, obj->vo_res, out_imgs); } else { osd_object_get_bitmaps(osd, obj, out_imgs); } @@ -82,8 +82,6 @@ enum mp_osdtype { OSDTYPE_SUB, OSDTYPE_SUB2, - OSDTYPE_NAV_HIGHLIGHT, // dvdnav fake highlights - OSDTYPE_PROGBAR, OSDTYPE_OSD, @@ -175,8 +173,6 @@ void osd_set_external(struct osd_state *osd, int res_x, int res_y, char *text); void osd_set_external2(struct osd_state *osd, struct sub_bitmaps *imgs); -void osd_set_nav_highlight(struct osd_state *osd, void *priv); - enum mp_osd_draw_flags { OSD_DRAW_SUB_FILTER = (1 << 0), OSD_DRAW_SUB_ONLY = (1 << 1), @@ -228,8 +224,4 @@ extern const char *const osd_ass_1; void osd_object_get_resolution(struct osd_state *osd, int obj, int *out_w, int *out_h); -// defined in player -void mp_nav_get_highlight(void *priv, struct mp_osd_res res, - struct sub_bitmaps *out_imgs); - #endif /* MPLAYER_SUB_H */ diff --git a/sub/osd_state.h b/sub/osd_state.h index 73bfcdd7d3..6fa03abe77 100644 --- a/sub/osd_state.h +++ b/sub/osd_state.h @@ -28,9 +28,6 @@ struct osd_object { // OSDTYPE_EXTERNAL2 struct sub_bitmaps *external2; - // OSDTYPE_NAV_HIGHLIGHT - void *highlight_priv; - // caches for OSD conversion (internal to render_object()) struct osd_conv_cache *cache[OSD_CONV_CACHE_MAX]; struct sub_bitmaps cached; |