From cd022d9cddd007ea1dc0fda861924a76b36970f2 Mon Sep 17 00:00:00 2001 From: Adrien Maglo Date: Wed, 23 Nov 2016 20:03:16 +0100 Subject: [PATCH] hotkeys: change the FOV instead of the zoom Signed-off-by: Thomas Guillem --- include/vlc_keys.h | 4 ++-- modules/control/hotkeys.c | 8 ++++---- src/config/keys.c | 4 ++-- src/libvlc-module.c | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/vlc_keys.h b/include/vlc_keys.h index 10d1d76b36..c91229e4ee 100644 --- a/include/vlc_keys.h +++ b/include/vlc_keys.h @@ -235,8 +235,8 @@ typedef enum vlc_action { ACTIONID_VIEWPOINT_ROLL_CLOCK, ACTIONID_VIEWPOINT_ROLL_ANTICLOCK, /* Combo Actions */ - ACTIONID_COMBO_VOL_ZOOM_UP, - ACTIONID_COMBO_VOL_ZOOM_DOWN, + ACTIONID_COMBO_VOL_FOV_UP, + ACTIONID_COMBO_VOL_FOV_DOWN, } vlc_action_t; diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index 59bfa82d32..b40e5e0e02 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -1369,15 +1369,15 @@ static int PutAction( intf_thread_t *p_intf, input_thread_t *p_input, DisplayPosition( p_vout, slider_chan, p_input ); break; - case ACTIONID_COMBO_VOL_ZOOM_UP: + case ACTIONID_COMBO_VOL_FOV_UP: if( b_vrnav ) - DO_ACTION( ACTIONID_VIEWPOINT_ZOOM_IN ); + DO_ACTION( ACTIONID_VIEWPOINT_FOV_IN ); else DO_ACTION( ACTIONID_VOL_UP ); break; - case ACTIONID_COMBO_VOL_ZOOM_DOWN: + case ACTIONID_COMBO_VOL_FOV_DOWN: if( b_vrnav ) - DO_ACTION( ACTIONID_VIEWPOINT_ZOOM_OUT ); + DO_ACTION( ACTIONID_VIEWPOINT_FOV_OUT ); else DO_ACTION( ACTIONID_VOL_DOWN ); break; diff --git a/src/config/keys.c b/src/config/keys.c index 6bfb76ffda..4af2895b4b 100644 --- a/src/config/keys.c +++ b/src/config/keys.c @@ -452,8 +452,8 @@ static void vlc_AddWheelMapping (void **map, uint32_t kmore, uint32_t kless, switch (mode) { case 0: /* volume up/down */ - amore = ACTIONID_COMBO_VOL_ZOOM_UP; - aless = ACTIONID_COMBO_VOL_ZOOM_DOWN; + amore = ACTIONID_COMBO_VOL_FOV_UP; + aless = ACTIONID_COMBO_VOL_FOV_DOWN; break; case 2: /* position latter/earlier */ amore = ACTIONID_JUMP_FORWARD_EXTRASHORT; diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 8c1c4361e3..c06412a0b4 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -2235,8 +2235,8 @@ vlc_module_begin () # define KEY_UNCROP_RIGHT "Alt+Shift+l" /* 360° Viewpoint */ -# define KEY_VIEWPOINT_ZOOM_IN "Page Up" -# define KEY_VIEWPOINT_ZOOM_OUT "Page Down" +# define KEY_VIEWPOINT_FOV_IN "Page Up" +# define KEY_VIEWPOINT_FOV_OUT "Page Down" /* the macosx-interface already has bindings */ # define KEY_ZOOM_QUARTER NULL @@ -2382,8 +2382,8 @@ vlc_module_begin () # define KEY_UNCROP_RIGHT "Alt+Shift+f" /* 360° Viewpoint */ -# define KEY_VIEWPOINT_ZOOM_IN "Page Up" -# define KEY_VIEWPOINT_ZOOM_OUT "Page Down" +# define KEY_VIEWPOINT_FOV_IN "Page Up" +# define KEY_VIEWPOINT_FOV_OUT "Page Down" /* Zooming */ # define KEY_ZOOM_QUARTER "Alt+1" @@ -2578,9 +2578,9 @@ vlc_module_begin () add_key( "key-loop", KEY_LOOP, LOOP_KEY_TEXT, LOOP_KEY_LONGTEXT, false ) - add_key( "key-viewpoint-fov-in", NULL, + add_key( "key-viewpoint-fov-in", KEY_VIEWPOINT_FOV_IN, VIEWPOINT_FOV_IN_KEY_TEXT, VIEWPOINT_FOV_IN_KEY_TEXT, true ) - add_key( "key-viewpoint-fov-out", NULL, + add_key( "key-viewpoint-fov-out", KEY_VIEWPOINT_FOV_OUT, VIEWPOINT_FOV_OUT_KEY_TEXT, VIEWPOINT_FOV_OUT_KEY_TEXT, true ) add_key( "key-viewpoint-zoom-in", KEY_VIEWPOINT_ZOOM_IN, VIEWPOINT_ZOOM_IN_KEY_TEXT, VIEWPOINT_ZOOM_IN_KEY_TEXT, true ) -- 2.11.4.GIT