[vlc-commits] bluray: implement INPUT_NAV_MENU

[Petri Hintukainen]

vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Fri May 13 10:51:59 2016 +0200| [0c7b95570f88e7b8dadccf244553440fa5f3c249] | committer: Jean-Baptiste Kempf

bluray: implement INPUT_NAV_MENU

Fixes problems with BluRay:
- If menu call is not allowed, playback seeks to title start
- Menu background video start position is ignored

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0c7b95570f88e7b8dadccf244553440fa5f3c249
---

 modules/access/bluray.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 44f8fc5..aeb0d65 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1961,6 +1961,16 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
         return sendKeyEvent(p_sys, BD_VK_RIGHT);
     case DEMUX_NAV_POPUP:
         return sendKeyEvent(p_sys, BD_VK_POPUP);
+    case DEMUX_NAV_MENU:
+        if (p_sys->b_menu) {
+            if (bd_menu_call(p_sys->bluray, -1) == 1) {
+                p_demux->info.i_update |= INPUT_UPDATE_TITLE | INPUT_UPDATE_SEEKPOINT;
+                return VLC_SUCCESS;
+            }
+            msg_Err(p_demux, "Can't select Top Menu title");
+            return sendKeyEvent(p_sys, BD_VK_POPUP);
+        }
+        return VLC_EGENERIC;
 
     case DEMUX_CAN_RECORD:
     case DEMUX_GET_FPS: