From 42eecb4f1b879a85bc93ef5b45eeed21326359bb Mon Sep 17 00:00:00 2001 From: ben Date: Sat, 25 Nov 2006 13:03:51 +0000 Subject: better nav highlight handling git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21216 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/stream_dvdnav.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'stream/stream_dvdnav.c') diff --git a/stream/stream_dvdnav.c b/stream/stream_dvdnav.c index 039dd1940d..5652f573b4 100644 --- a/stream/stream_dvdnav.c +++ b/stream/stream_dvdnav.c @@ -46,8 +46,7 @@ static struct m_struct_st stream_opts = { }; int dvd_nav_still=0; /* are we on a still picture? */ -dvdnav_highlight_event_t dvd_nav_hl; -int dvd_nav_hl_on = 0; +static dvdnav_highlight_event_t dvd_nav_hl; static int seek(stream_t *s, off_t newpos); @@ -129,7 +128,6 @@ static void dvdnav_get_highlight (dvdnav_priv_t *priv, dvdnav_highlight_event_t hlev->palette = (btni->btn_coln == 0) ? 0 : pnavpci->hli.btn_colit.btn_coli[btni->btn_coln - 1][0]; - dvd_nav_hl_on = 1; break; } } @@ -137,7 +135,6 @@ static void dvdnav_get_highlight (dvdnav_priv_t *priv, dvdnav_highlight_event_t hlev->sx = hlev->ex = 0; hlev->sy = hlev->ey = 0; hlev->palette = hlev->buttonN = 0; - dvd_nav_hl_on = 0; } } @@ -494,6 +491,12 @@ int dvdnav_number_of_subs(stream_t *stream) { return n; } +void mp_dvdnav_get_highlight (nav_highlight_t *hl) { + hl->sx = dvd_nav_hl.sx; + hl->sy = dvd_nav_hl.sy; + hl->ex = dvd_nav_hl.ex; + hl->ey = dvd_nav_hl.ey; +} stream_info_t stream_info_dvdnav = { "DVDNAV stream", -- cgit v1.2.3