Skip to content

V
vlc-2-2
Commit 56195089 authored by Petri Hintukainen's avatar Petri Hintukainen Committed by Jean-Baptiste Kempf
Browse files
Options

bluray: enable pop-up menu 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent e1a9f330
Show whitespace changes
Inline Side-by-side
Showing with 12 additions and 0 deletions
modules/access/bluray.c
View file @ 56195089
...@@ -136,6 +136,8 @@ struct demux_sys_t ...@@ -136,6 +136,8 @@ struct demux_sys_t
bluray_overlay_t *p_overlays[MAX_OVERLAY]; bluray_overlay_t *p_overlays[MAX_OVERLAY];
int current_overlay; // -1 if no current overlay; int current_overlay; // -1 if no current overlay;
bool b_menu; bool b_menu;
bool b_menu_open;
bool b_popup_available;
/* */ /* */
input_thread_t *p_input; input_thread_t *p_input;
...@@ -1393,6 +1395,9 @@ static int blurayControl(demux_t *p_demux, int query, va_list args) ...@@ -1393,6 +1395,9 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
} }
case DEMUX_NAV_ACTIVATE: case DEMUX_NAV_ACTIVATE:
if (p_sys->b_popup_available && !p_sys->b_menu_open) {
return sendKeyEvent(p_sys, BD_VK_POPUP);
}
return sendKeyEvent(p_sys, BD_VK_ENTER); return sendKeyEvent(p_sys, BD_VK_ENTER);
case DEMUX_NAV_UP: case DEMUX_NAV_UP:
return sendKeyEvent(p_sys, BD_VK_UP); return sendKeyEvent(p_sys, BD_VK_UP);
...@@ -1502,6 +1507,13 @@ static void blurayHandleEvent(demux_t *p_demux, const BD_EVENT *e) ...@@ -1502,6 +1507,13 @@ static void blurayHandleEvent(demux_t *p_demux, const BD_EVENT *e)
break; break;
case BD_EVENT_ANGLE: case BD_EVENT_ANGLE:
break; break;
case BD_EVENT_MENU:
p_sys->b_menu_open = e->param;
break;
case BD_EVENT_POPUP:
p_sys->b_popup_available = e->param;
/* TODO: show / hide pop-up menu button in gui ? */
break;
/* /*
* stream selection events * stream selection events
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment