summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
Diffstat (limited to 'sub')
-rw-r--r--sub/osd_dummy.c4
-rw-r--r--sub/osd_libass.c10
-rw-r--r--sub/sub.c10
-rw-r--r--sub/sub.h7
4 files changed, 0 insertions, 31 deletions
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index ff40c19301..d869fe16c8 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -10,10 +10,6 @@ void vo_update_text_osd(struct osd_state *osd, mp_osd_obj_t *obj)
{
}
-void vo_update_text_teletext(struct osd_state *osd, mp_osd_obj_t *obj)
-{
-}
-
void vo_update_text_progbar(struct osd_state *osd, mp_osd_obj_t *obj)
{
}
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 73edd78118..03ab9b55dd 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -361,16 +361,6 @@ void vo_update_text_sub(struct osd_state *osd, mp_osd_obj_t* obj)
talloc_free(text);
}
-// Unimplemented.
-void vo_update_text_teletext(struct osd_state *osd, mp_osd_obj_t *obj)
-{
- obj->flags |= OSDFLAG_CHANGED;
- obj->flags &= ~OSDFLAG_VISIBLE;
- if (!vo_osd_teletext_page || !vo_osd_teletext_mode)
- return;
- mp_msg(MSGT_OSD, MSGL_ERR, "OSD: teletext rendering not implemented\n");
-}
-
// unneeded
void osd_font_invalidate(void) {}
void osd_font_load(struct osd_state *osd) {}
diff --git a/sub/sub.c b/sub/sub.c
index 492c59f7d8..cc0407ea1c 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -29,7 +29,6 @@
#include "stream/stream_dvdnav.h"
#define OSD_NAV_BOX_ALPHA 0x7f
-#include "libmpcodecs/dec_teletext.h"
#include "osdep/timer.h"
#include "talloc.h"
@@ -57,10 +56,6 @@ char * const sub_osd_names[]={
};
char * const sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" };
-void* vo_osd_teletext_page=NULL;
-int vo_osd_teletext_half = 0;
-int vo_osd_teletext_mode=0;
-int vo_osd_teletext_format=0;
int sub_unicode=0;
int sub_utf8=0;
int sub_pos=100;
@@ -250,9 +245,6 @@ static int osd_update_ext(struct osd_state *osd, int dxs, int dys,
case OSDTYPE_SUBTITLE:
vo_update_text_sub(osd, obj);
break;
- case OSDTYPE_TELETEXT:
- vo_update_text_teletext(osd, obj);
- break;
case OSDTYPE_PROGBAR:
vo_update_text_progbar(osd, obj);
break;
@@ -330,7 +322,6 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
#ifdef CONFIG_DVDNAV
new_osd_obj(OSDTYPE_DVDNAV);
#endif
- new_osd_obj(OSDTYPE_TELETEXT);
osd_font_invalidate();
osd->osd_text = talloc_strdup(osd, "");
osd_init_backend(osd);
@@ -369,7 +360,6 @@ void osd_draw_text_ext(struct osd_state *osd, int dxs, int dys,
#ifdef CONFIG_DVDNAV
case OSDTYPE_DVDNAV:
#endif
- case OSDTYPE_TELETEXT:
case OSDTYPE_OSD:
case OSDTYPE_SUBTITLE:
case OSDTYPE_PROGBAR:
diff --git a/sub/sub.h b/sub/sub.h
index 33b5ccf747..35f213d2db 100644
--- a/sub/sub.h
+++ b/sub/sub.h
@@ -30,7 +30,6 @@ typedef struct mp_osd_bbox_s {
#define OSDTYPE_PROGBAR 3
#define OSDTYPE_SPU 4
#define OSDTYPE_DVDNAV 5
-#define OSDTYPE_TELETEXT 6
#define OSDFLAG_VISIBLE 1
#define OSDFLAG_CHANGED 2
@@ -90,11 +89,6 @@ struct osd_state {
extern subtitle* vo_sub;
-extern void* vo_osd_teletext_page;
-extern int vo_osd_teletext_half;
-extern int vo_osd_teletext_mode;
-extern int vo_osd_teletext_format;
-
extern int vo_osd_progbar_type;
extern int vo_osd_progbar_value; // 0..255
@@ -192,7 +186,6 @@ void vo_draw_text_from_buffer(mp_osd_obj_t* obj,void (*draw_alpha)(void *ctx, in
// defined in osd_ft.c or osd_libass.c
void vo_update_text_osd(struct osd_state *osd, mp_osd_obj_t *obj);
-void vo_update_text_teletext(struct osd_state *osd, mp_osd_obj_t *obj);
void vo_update_text_progbar(struct osd_state *osd, mp_osd_obj_t *obj);
void vo_update_text_sub(struct osd_state *osd, mp_osd_obj_t *obj);
void osd_get_function_sym(char *buffer, size_t buffer_size, int osd_function);