[vlc-commits] Add INPUT_NAV_POPUP and DEMUX_NAV_POPUP for BluRay pop-up menu

[Petri Hintukainen]

vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Fri Nov 20 12:29:59 2015 +0200| [4e9f1e4679dc0c6b06e7f0218a5c0da71f4206b7] | committer: Jean-Baptiste Kempf

Add INPUT_NAV_POPUP and DEMUX_NAV_POPUP for BluRay pop-up menu

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

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

 include/vlc_demux.h        |    1 +
 include/vlc_input.h        |    1 +
 src/input/control.c        |    1 +
 src/input/input.c          |    2 ++
 src/input/input_internal.h |    1 +
 src/input/var.c            |   12 ++++++++++++
 6 files changed, 18 insertions(+)

diff --git a/include/vlc_demux.h b/include/vlc_demux.h
index 547428d..bf88c82 100644
--- a/include/vlc_demux.h
+++ b/include/vlc_demux.h
@@ -268,6 +268,7 @@ enum demux_query_e
     DEMUX_NAV_DOWN,            /* res=can fail */
     DEMUX_NAV_LEFT,            /* res=can fail */
     DEMUX_NAV_RIGHT,           /* res=can fail */
+    DEMUX_NAV_POPUP,           /* res=can fail */
 };
 
 /*************************************************************************
diff --git a/include/vlc_input.h b/include/vlc_input.h
index 6ec99e7..6399cfb 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -432,6 +432,7 @@ enum input_query_e
     INPUT_NAV_DOWN,
     INPUT_NAV_LEFT,
     INPUT_NAV_RIGHT,
+    INPUT_NAV_POPUP,
 
     /* Meta datas */
     INPUT_ADD_INFO,   /* arg1= char* arg2= char* arg3=...     res=can fail */
diff --git a/src/input/control.c b/src/input/control.c
index a0c55cd..a856737 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -141,6 +141,7 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
         case INPUT_NAV_DOWN:
         case INPUT_NAV_LEFT:
         case INPUT_NAV_RIGHT:
+        case INPUT_NAV_POPUP:
             input_ControlPush( p_input, i_query - INPUT_NAV_ACTIVATE
                                + INPUT_CONTROL_NAV_ACTIVATE, NULL );
             return VLC_SUCCESS;
diff --git a/src/input/input.c b/src/input/input.c
index c3303ef..a5d408c 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -1492,6 +1492,7 @@ static bool ControlIsSeekRequest( int i_type )
     case INPUT_CONTROL_NAV_DOWN:
     case INPUT_CONTROL_NAV_LEFT:
     case INPUT_CONTROL_NAV_RIGHT:
+    case INPUT_CONTROL_NAV_POPUP:
         return true;
     default:
         return false;
@@ -1970,6 +1971,7 @@ static bool Control( input_thread_t *p_input,
         case INPUT_CONTROL_NAV_DOWN:
         case INPUT_CONTROL_NAV_LEFT:
         case INPUT_CONTROL_NAV_RIGHT:
+        case INPUT_CONTROL_NAV_POPUP:
             demux_Control( p_input->p->master->p_demux, i_type
                            - INPUT_CONTROL_NAV_ACTIVATE + DEMUX_NAV_ACTIVATE );
             break;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index bab69bf..249ef2e 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -199,6 +199,7 @@ enum input_control_e
     INPUT_CONTROL_NAV_DOWN,     // INPUT_NAV_* and DEMUX_NAV_*.
     INPUT_CONTROL_NAV_LEFT,
     INPUT_CONTROL_NAV_RIGHT,
+    INPUT_CONTROL_NAV_POPUP,
 
     INPUT_CONTROL_SET_ES,
     INPUT_CONTROL_RESTART_ES,
diff --git a/src/input/var.c b/src/input/var.c
index 0ad530c..7218a56 100644
--- a/src/input/var.c
+++ b/src/input/var.c
@@ -112,6 +112,7 @@ static const vlc_input_callback_t p_input_navigation_callbacks[] =
 {
     CALLBACK( "next-title", TitleCallback ),
     CALLBACK( "prev-title", TitleCallback ),
+    CALLBACK( "menu-popup", TitleCallback ),
 
     CALLBACK( NULL, NULL )
 };
@@ -269,6 +270,13 @@ void input_ControlVarNavigation( input_thread_t *p_input )
             var_Change( p_input, "prev-title", VLC_VAR_SETTEXT, &text, NULL );
             var_AddCallback( p_input, "prev-title", TitleCallback, NULL );
         }
+
+        if( var_Type( p_input, "menu-popup" ) == 0 ) {
+            var_Create( p_input, "menu-popup", VLC_VAR_VOID );
+            text.psz_string = _("Menu popup");
+            var_Change( p_input, "menu-popup", VLC_VAR_SETTEXT, &text, NULL );
+            var_AddCallback( p_input, "menu-popup", TitleCallback, NULL );
+        }
     }
 
     /* Create titles and chapters */
@@ -672,6 +680,10 @@ static int TitleCallback( vlc_object_t *p_this, char const *psz_cmd,
         if( val.i_int >= 0 )
             var_Change( p_input, "title", VLC_VAR_SETVALUE, &val, NULL );
     }
+    else if( !strcmp( psz_cmd, "menu-popup" ) )
+    {
+        input_ControlPush( p_input, INPUT_CONTROL_NAV_POPUP, NULL );
+    }
     else
     {
         input_ControlPush( p_input, INPUT_CONTROL_SET_TITLE, &newval );