diff options
author | wm4 <wm4@nowhere> | 2015-08-03 23:33:03 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2015-08-03 23:49:14 +0200 |
commit | f792f56440c33fae4f027518fe999daa9e8d3771 (patch) | |
tree | abd7fb8f75a17e03a42696631543b4aa8aff2efc /sub/osd.c | |
parent | 59d44ecef17790739211c56e7b2ca5c2682d855a (diff) | |
download | mpv-f792f56440c33fae4f027518fe999daa9e8d3771.tar.bz2 mpv-f792f56440c33fae4f027518fe999daa9e8d3771.tar.xz |
player: remove higher-level remains of DVD/BD menu support
Nobody wanted to restore this, so it gets the boot.
If anyone still wants to volunteer to restore menu support, this would
be welcome. (I might even try it myself if I feel masochistic and like
wasting a lot of time for nothing.) But if it does get restored, it
should be done differently. There were many stupid things about how it
was done. For example, it somehow tried to pull mp_nav_events through
all the layers (including needing to "buffer" them in the demuxer),
which was needlessly complicated. It could be done simpler.
This code was already inactive, so this commit actually changes nothing.
Also keep in mind that normal DVD/BD playback still works.
Diffstat (limited to 'sub/osd.c')
-rw-r--r-- | sub/osd.c | 11 |
1 files changed, 0 insertions, 11 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); } |