[vlc-devel] [PATCH 17/18] input: remove INPUT_NAV_*

[Thomas Guillem]

This is now directly handled by the player.
---
 include/vlc_input.h | 16 +---------------
 src/input/control.c | 11 -----------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index c78efec8a2..30ef412d48 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -536,21 +536,7 @@ typedef void (*input_thread_events_cb)( input_thread_t *input,
  */
 enum input_query_e
 {
-    /* Menu (VCD/DVD/BD) Navigation */
-    /** Activate the navigation item selected. res=can fail */
-    INPUT_NAV_ACTIVATE,
-    /** Use the up arrow to select a navigation item above. res=can fail */
-    INPUT_NAV_UP,
-    /** Use the down arrow to select a navigation item under. res=can fail */
-    INPUT_NAV_DOWN,
-    /** Use the left arrow to select a navigation item on the left. res=can fail */
-    INPUT_NAV_LEFT,
-    /** Use the right arrow to select a navigation item on the right. res=can fail */
-    INPUT_NAV_RIGHT,
-    /** Activate the popup Menu (for BD). res=can fail */
-    INPUT_NAV_POPUP,
-    /** Activate disc Root Menu. res=can fail */
-    INPUT_NAV_MENU,
+    INPUT_DUMMY,
 };
 
 /** @}*/
diff --git a/src/input/control.c b/src/input/control.c
index 3dc9f7af43..1fe038354e 100644
--- a/src/input/control.c
+++ b/src/input/control.c
@@ -70,17 +70,6 @@ int input_vaControl( input_thread_t *p_input, int i_query, va_list args )
 
     switch( i_query )
     {
-        case INPUT_NAV_ACTIVATE:
-        case INPUT_NAV_UP:
-        case INPUT_NAV_DOWN:
-        case INPUT_NAV_LEFT:
-        case INPUT_NAV_RIGHT:
-        case INPUT_NAV_POPUP:
-        case INPUT_NAV_MENU:
-            input_ControlPushHelper( p_input, i_query - INPUT_NAV_ACTIVATE
-                               + INPUT_CONTROL_NAV_ACTIVATE, NULL );
-            return VLC_SUCCESS;
-
         default:
             msg_Err( p_input, "unknown query 0x%x in %s", i_query, __func__ );
             return VLC_EGENERIC;
-- 
2.20.1