summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-07-14 14:33:26 +0200
committerwm4 <wm4@nowhere>2014-07-14 14:34:14 +0200
commit4b93210e0c244a65ef10a566abed2ad25ecaf9a1 (patch)
tree6ff381d5cfd95f7b89c9253f07faa75883983dcc /sub
parentc129e3f666a4d3f562f32e633293cf9bbb13c3ac (diff)
downloadmpv-4b93210e0c244a65ef10a566abed2ad25ecaf9a1.tar.bz2
mpv-4b93210e0c244a65ef10a566abed2ad25ecaf9a1.tar.xz
Remove DVD and Bluray support
It never worked well. Just remux your DVD and BD images to mkv.
Diffstat (limited to 'sub')
-rw-r--r--sub/osd.c11
-rw-r--r--sub/osd.h8
2 files changed, 0 insertions, 19 deletions
diff --git a/sub/osd.c b/sub/osd.c
index e88df98afe..3a3c8b6c25 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -206,14 +206,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],
@@ -247,9 +239,6 @@ static void render_object(struct osd_state *osd, struct osd_object *obj,
*out_imgs = *obj->external2;
obj->external2->bitmap_id = obj->external2->bitmap_pos_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);
}
diff --git a/sub/osd.h b/sub/osd.h
index 2a5bf71b05..97bc2f067d 100644
--- a/sub/osd.h
+++ b/sub/osd.h
@@ -84,8 +84,6 @@ enum mp_osdtype {
OSDTYPE_SUB,
OSDTYPE_SUB2,
- OSDTYPE_NAV_HIGHLIGHT, // dvdnav fake highlights
-
OSDTYPE_PROGBAR,
OSDTYPE_OSD,
@@ -174,8 +172,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),
@@ -224,8 +220,4 @@ void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function);
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 */