diff options
Diffstat (limited to 'libvo/sub.c')
-rw-r--r-- | libvo/sub.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index bffb5646a3..58541bcbb9 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -8,7 +8,7 @@ #include <malloc.h> #endif -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV #include "stream/stream.h" #include "stream/stream_dvdnav.h" #define OSD_NAV_BOX_ALPHA 0x7f @@ -88,7 +88,7 @@ int sub_visibility=1; int sub_bg_color=0; /* subtitles background color */ int sub_bg_alpha=0; int sub_justify=0; -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV static nav_highlight_t nav_hl; #endif @@ -219,7 +219,7 @@ inline static void vo_update_text_osd(struct osd_state *osd, mp_osd_obj_t* obj, } } -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey) { nav_hl.sx = sx; nav_hl.sy = sy; @@ -1122,7 +1122,7 @@ int osd_update(struct osd_state *osd, int dxs, int dys) int vis=obj->flags&OSDFLAG_VISIBLE; obj->flags&=~OSDFLAG_BBOX; switch(obj->type){ -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV case OSDTYPE_DVDNAV: vo_update_nav(obj,dxs,dys); break; @@ -1202,7 +1202,7 @@ struct osd_state *osd_create(void) new_osd_obj(OSDTYPE_SUBTITLE); new_osd_obj(OSDTYPE_PROGBAR); new_osd_obj(OSDTYPE_SPU); -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV new_osd_obj(OSDTYPE_DVDNAV); #endif #if HAVE_TV_TELETEXT @@ -1251,7 +1251,7 @@ void osd_draw_text(struct osd_state *osd, int dxs, int dys, case OSDTYPE_SPU: vo_draw_spudec_sub(obj, draw_alpha, ctx); // FIXME break; -#ifdef USE_DVDNAV +#ifdef CONFIG_DVDNAV case OSDTYPE_DVDNAV: #endif #ifdef HAVE_TV_TELETEXT |