diff options
| author | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 16:40:42 +0000 |
|---|---|---|
| committer | cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-11-07 16:40:42 +0000 |
| commit | 2a5611473cb3696597240be15b0e1e662c1c79b8 (patch) | |
| tree | b975e1a5a810d109e78a419af4818455de9f0192 /libvo | |
| parent | 241164f72c01b4e15e7afff36064a9217ebad77f (diff) | |
| download | mpv-2a5611473cb3696597240be15b0e1e662c1c79b8.tar.bz2 mpv-2a5611473cb3696597240be15b0e1e662c1c79b8.tar.xz | |
Remove CONFIG_TV_TELETEXT.
DVB teletext support is nearly finished, it will be possible to read
teletext from file, it will not be depending on reception any more.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29851 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/sub.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index 114739bf13..2a872bdc1f 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -86,13 +86,11 @@ font_desc_t* vo_font=NULL; font_desc_t* sub_font=NULL; unsigned char* vo_osd_text=NULL; -#ifdef CONFIG_TV_TELETEXT 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 vo_osd_teletext_scale=0; -#endif int sub_unicode=0; int sub_utf8=0; int sub_pos=100; @@ -274,7 +272,6 @@ inline static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys, int left_ } #endif -#ifdef CONFIG_TV_TELETEXT // renders char to a big per-object buffer where alpha and bitmap are separated static void tt_draw_alpha_buf(mp_osd_obj_t* obj, int x0,int y0, int w,int h, unsigned char* src, int stride,int fg,int bg,int alpha) { @@ -516,7 +513,6 @@ TODO: support for separated graphics symbols (where six rectangles does not touc for(i=0;i<9;i++) free(buf[i]); } -#endif int vo_osd_progbar_type=-1; int vo_osd_progbar_value=100; // 0..256 @@ -1154,11 +1150,9 @@ int vo_update_osd_ext(int dxs,int dys, int left_border, int top_border, case OSDTYPE_SUBTITLE: vo_update_text_sub(obj,dxs,dys); break; -#ifdef CONFIG_TV_TELETEXT case OSDTYPE_TELETEXT: vo_update_text_teletext(obj,dxs,dys); break; -#endif case OSDTYPE_PROGBAR: vo_update_text_progbar(obj,dxs,dys); break; @@ -1230,9 +1224,7 @@ void vo_init_osd(void){ #ifdef CONFIG_DVDNAV new_osd_obj(OSDTYPE_DVDNAV); #endif -#ifdef CONFIG_TV_TELETEXT new_osd_obj(OSDTYPE_TELETEXT); -#endif #ifdef CONFIG_FREETYPE force_load_font = 1; #endif @@ -1273,9 +1265,7 @@ void vo_draw_text_ext(int dxs, int dys, int left_border, int top_border, #ifdef CONFIG_DVDNAV case OSDTYPE_DVDNAV: #endif -#ifdef CONFIG_TV_TELETEXT case OSDTYPE_TELETEXT: -#endif case OSDTYPE_OSD: case OSDTYPE_SUBTITLE: case OSDTYPE_PROGBAR: |