diff options
author | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 17:44:22 +0000 |
---|---|---|
committer | ben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-11-25 17:44:22 +0000 |
commit | 1e30c2e5aeb0faadab006a6664fad22b5d3ce4f5 (patch) | |
tree | 57cfa34d9ba2bfe7e8b6b976447541e2dc9f7074 /libvo | |
parent | 293c11d3b248a2a1e7d1c8e36c24178880974d6a (diff) | |
download | mpv-1e30c2e5aeb0faadab006a6664fad22b5d3ce4f5.tar.bz2 mpv-1e30c2e5aeb0faadab006a6664fad22b5d3ce4f5.tar.xz |
keep nav highlight event in dvdnav priv structure
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21235 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/sub.c | 20 | ||||
-rw-r--r-- | libvo/sub.h | 4 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libvo/sub.c b/libvo/sub.c index bdee948650..e4a3978113 100644 --- a/libvo/sub.c +++ b/libvo/sub.c @@ -74,6 +74,9 @@ int sub_visibility=1; int sub_bg_color=0; /* subtitles background color */ int sub_bg_alpha=0; int sub_justify=0; +#ifdef USE_DVDNAV +static nav_highlight_t nav_hl; +#endif // return the real height of a char: static inline int get_height(int c,int h){ @@ -199,15 +202,20 @@ inline static void vo_update_text_osd(mp_osd_obj_t* obj,int dxs,int dys){ } #ifdef USE_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; + nav_hl.ex = ex; + nav_hl.ey = ey; +} + inline static void vo_update_nav (mp_osd_obj_t *obj, int dxs, int dys) { - nav_highlight_t hl; int len; - mp_dvdnav_get_highlight (&hl); - obj->bbox.x1 = obj->x = hl.sx; - obj->bbox.y1 = obj->y = hl.sy; - obj->bbox.x2 = hl.ex; - obj->bbox.y2 = hl.ey; + obj->bbox.x1 = obj->x = nav_hl.sx; + obj->bbox.y1 = obj->y = nav_hl.sy; + obj->bbox.x2 = nav_hl.ex; + obj->bbox.y2 = nav_hl.ey; alloc_buf (obj); len = obj->stride * (obj->bbox.y2 - obj->bbox.y1); diff --git a/libvo/sub.h b/libvo/sub.h index d9e295b6f8..ba54046fdb 100644 --- a/libvo/sub.h +++ b/libvo/sub.h @@ -124,5 +124,9 @@ extern int vo_osd_changed_flag; unsigned utf8_get_char(char **str); +#ifdef USE_DVDNAV +void osd_set_nav_box (uint16_t sx, uint16_t sy, uint16_t ex, uint16_t ey); +#endif + #endif #endif |