From 4830f27a40323fe859dc166337a2b861877b7121 Mon Sep 17 00:00:00 2001 From: manuel Date: Mon, 1 Jan 2018 13:40:09 +0100 Subject: sync with upstream --- xbmc/input/ActionIDs.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'xbmc/input/ActionIDs.h') diff --git a/xbmc/input/ActionIDs.h b/xbmc/input/ActionIDs.h index b88df78..5db1ffc 100644 --- a/xbmc/input/ActionIDs.h +++ b/xbmc/input/ActionIDs.h @@ -80,7 +80,7 @@ #define ACTION_CALIBRATE_SWAP_ARROWS 47 //!< select next arrow. Can b used in: settingsScreenCalibration.xml windowid=11 #define ACTION_CALIBRATE_RESET 48 //!< reset calibration to defaults. Can b used in: `settingsScreenCalibration.xml` windowid=11/settingsUICalibration.xml windowid=10 #define ACTION_ANALOG_MOVE 49 //!< analog thumbstick move. Can b used in: `slideshow.xml` windowid=2007/settingsScreenCalibration.xml windowid=11/settingsUICalibration.xml windowid=10 - //!< @note see also ACTION_ANALOG_MOVE_X, ACTION_ANALOG_MOVE_Y + //!< @note see also ACTION_ANALOG_MOVE_X_LEFT, ACTION_ANALOG_MOVE_X_RIGHT, ACTION_ANALOG_MOVE_Y_UP, ACTION_ANALOG_MOVE_Y_DOWN #define ACTION_ROTATE_PICTURE_CW 50 //!< rotate current picture clockwise during slideshow. Can be used in slideshow.xml window id=2007 #define ACTION_ROTATE_PICTURE_CCW 51 //!< rotate current picture counterclockwise during slideshow. Can be used in slideshow.xml window id=2007 @@ -102,8 +102,8 @@ #define REMOTE_8 66 #define REMOTE_9 67 -#define ACTION_PLAY 68 //!< Unused at the moment #define ACTION_PLAYER_PROCESS_INFO 69 //!< show player process info (video decoder, pixel format, pvr signal strength and the like +#define ACTION_PLAYER_PROGRAM_SELECT 70 #define ACTION_SMALL_STEP_BACK 76 //!< jumps a few seconds back during playback of movie. Can b used in videoFullScreen.xml window id=2005 #define ACTION_PLAYER_FORWARD 77 //!< FF in current file played. global action, can be used anywhere @@ -228,6 +228,7 @@ #define ACTION_PVR_PLAY_TV 189 #define ACTION_PVR_PLAY_RADIO 190 #define ACTION_PVR_SHOW_TIMER_RULE 191 +#define ACTION_CHANNEL_NUMBER_SEP 192 #define ACTION_TOGGLE_FULLSCREEN 199 //!< switch 2 desktop resolution #define ACTION_TOGGLE_WATCHED 200 //!< Toggle watched status (videos) @@ -274,6 +275,8 @@ #define ACTION_PLAYER_RESET 248 //!< Send a reset command to the active game +#define ACTION_TOGGLE_FONT 249 //!< Toggle font. Used in TextViewer dialog + // Voice actions #define ACTION_VOICE_RECOGNIZE 300 @@ -302,8 +305,10 @@ #define ACTION_GESTURE_END 599 // other, non-gesture actions -#define ACTION_ANALOG_MOVE_X 601 //!< analog thumbstick move, horizontal axis; see ACTION_ANALOG_MOVE -#define ACTION_ANALOG_MOVE_Y 602 //!< analog thumbstick move, vertical axis; see ACTION_ANALOG_MOVE +#define ACTION_ANALOG_MOVE_X_LEFT 601 //!< analog thumbstick move, horizontal axis, left; see ACTION_ANALOG_MOVE +#define ACTION_ANALOG_MOVE_X_RIGHT 602 //!< analog thumbstick move, horizontal axis, right; see ACTION_ANALOG_MOVE +#define ACTION_ANALOG_MOVE_Y_UP 603 //!< analog thumbstick move, vertical axis, up; see ACTION_ANALOG_MOVE +#define ACTION_ANALOG_MOVE_Y_DOWN 604 //!< analog thumbstick move, vertical axis, down; see ACTION_ANALOG_MOVE //@} // The NOOP action can be specified to disable an input event. This is -- cgit v1.2.3