vlc | branch: master | Thomas Guillem <tho...@gllm.fr> | Wed Nov 16 13:12:02 2016 +0100| [d68a92f55b05f971d554ec3ad5cb2cace6872445] | committer: Thomas Guillem
core: keys: rename ACTIONID_FOV* to ACTIONID_VIEWPOINT_FOV* > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d68a92f55b05f971d554ec3ad5cb2cace6872445 --- include/vlc_keys.h | 4 ++-- modules/control/hotkeys.c | 4 ++-- src/config/keys.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 3788e68..1bf2a72 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -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; diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 725f5f9..0ad8b42 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -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 }, diff --git a/src/config/keys.c b/src/config/keys.c index d1611f9..c89983e 100644 --- a/src/config/keys.c +++ b/src/config/keys.c @@ -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, }, _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits