core: keys: rename ACTIONID_FOV* to ACTIONID_VIEWPOINT_FOV*
authorThomas Guillem <thomas@gllm.fr>
Wed, 16 Nov 2016 12:12:02 +0000 (13:12 +0100)
committerThomas Guillem <thomas@gllm.fr>
Thu, 17 Nov 2016 08:37:26 +0000 (09:37 +0100)
include/vlc_keys.h
modules/control/hotkeys.c
src/config/keys.c

index 3788e68..1bf2a72 100644 (file)
@@ -228,8 +228,8 @@ typedef enum vlc_action {
     ACTIONID_PROGRAM_SID_PREV,
     ACTIONID_INTF_POPUP_MENU,
     /* Viewpoint */
-    ACTIONID_FOV_IN,
-    ACTIONID_FOV_OUT,
+    ACTIONID_VIEWPOINT_FOV_IN,
+    ACTIONID_VIEWPOINT_FOV_OUT,
 
 } vlc_action_t;
 
index 725f5f9..0ad8b42 100644 (file)
@@ -919,13 +919,13 @@ static int PutAction( intf_thread_t *p_intf, int i_action )
                 var_DecInteger( p_vout, "crop-right" );
             break;
 
-        case ACTIONID_FOV_IN:
+        case ACTIONID_VIEWPOINT_FOV_IN:
             if( p_vout )
                 input_UpdateViewpoint( p_input,
                                        &(vlc_viewpoint_t) { .fov = -1.f },
                                        false );
             break;
-        case ACTIONID_FOV_OUT:
+        case ACTIONID_VIEWPOINT_FOV_OUT:
             if( p_vout )
                 input_UpdateViewpoint( p_input,
                                        &(vlc_viewpoint_t) { .fov = 1.f },
index d1611f9..c89983e 100644 (file)
@@ -368,8 +368,8 @@ static const struct action actions[] =
     { "uncrop-right", ACTIONID_UNCROP_RIGHT, },
     { "uncrop-top", ACTIONID_UNCROP_TOP, },
     { "unzoom", ACTIONID_UNZOOM, },
-    { "viewpoint-fov-in", ACTIONID_FOV_IN, },
-    { "viewpoint-fov-out", ACTIONID_FOV_OUT, },
+    { "viewpoint-fov-in", ACTIONID_VIEWPOINT_FOV_IN, },
+    { "viewpoint-fov-out", ACTIONID_VIEWPOINT_FOV_OUT, },
     { "vol-down", ACTIONID_VOL_DOWN, },
     { "vol-mute", ACTIONID_VOL_MUTE, },
     { "vol-up", ACTIONID_VOL_UP, },