From 56a16d7b236984d2a2012874eb5ed790a9ccf26b Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Mon, 21 Aug 2006 11:28:29 +0000 Subject: Action lists no longer automatically "chain" to the CONTEXT_STD unless explicitly told to git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10671 a1c6a512-1295-4272-9138-f99709370657 --- apps/action.c | 7 ++----- apps/action.h | 8 ++++--- apps/keymaps/keymap-h10.c | 14 ++++++------- apps/keymaps/keymap-h1x0_h3x0.c | 46 ++++++++++++++++++++--------------------- apps/keymaps/keymap-ifp7xx.c | 10 ++++----- apps/keymaps/keymap-ipod.c | 12 +++++------ apps/keymaps/keymap-ondio.c | 10 ++++----- apps/keymaps/keymap-player.c | 10 ++++----- apps/keymaps/keymap-recorder.c | 16 +++++++------- apps/keymaps/keymap-x5.c | 20 +++++++++--------- 10 files changed, 76 insertions(+), 77 deletions(-) (limited to 'apps') diff --git a/apps/action.c b/apps/action.c index e031ce0312..c0d6021995 100644 --- a/apps/action.c +++ b/apps/action.c @@ -161,11 +161,8 @@ int get_action_worker(int context, int timeout, ret = do_button_check(items,button,last_button,&i); - if ((context == CONTEXT_STD) -#if (BUTTON_REMOTE != 0) - || ((unsigned)context == (CONTEXT_STD|CONTEXT_REMOTE)) -#endif - ) break; + if (context == CONTEXT_STOPSEARCHING) + break; if (ret == ACTION_UNKNOWN ) { diff --git a/apps/action.h b/apps/action.h index 147b1532b7..549886b549 100644 --- a/apps/action.h +++ b/apps/action.h @@ -21,14 +21,16 @@ #include "stdbool.h" #include "button.h" -#define LAST_ITEM_IN_LIST { ACTION_NONE, BUTTON_NONE, BUTTON_NONE } -#define LAST_ITEM_IN_LIST__NEXTLIST(a) { a, BUTTON_NONE, BUTTON_NONE } - #define TIMEOUT_BLOCK -1 #define TIMEOUT_NOBLOCK 0 + +#define CONTEXT_STOPSEARCHING 0xFFFFFFFF #define CONTEXT_REMOTE 0x80000000 /* | this against another context to get remote buttons for that context */ #define CONTEXT_CUSTOM 0x40000000 /* | this against anything to get your context number */ +#define LAST_ITEM_IN_LIST { CONTEXT_STOPSEARCHING, BUTTON_NONE, BUTTON_NONE } +#define LAST_ITEM_IN_LIST__NEXTLIST(a) { a, BUTTON_NONE, BUTTON_NONE } + #ifndef HAS_BUTTON_HOLD #define ALLOW_SOFTLOCK 0x20000000 /* will be stripped.. never needed except in calls to get_action() */ #else diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c index db55f825e9..25ee13022f 100644 --- a/apps/keymaps/keymap-h10.c +++ b/apps/keymaps/keymap-h10.c @@ -80,7 +80,7 @@ const struct button_mapping button_context_settings[] = { { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings */ const struct button_mapping button_context_tree[] = { @@ -88,7 +88,7 @@ const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_tree */ const struct button_mapping button_context_tree_scroll_lr[] = { @@ -105,7 +105,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_yesno */ const struct button_mapping button_context_quickscreen[] = { @@ -119,7 +119,7 @@ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_quickscreen */ const struct button_mapping button_context_settings_r_is_inc[] = { @@ -134,7 +134,7 @@ const struct button_mapping button_context_settings_r_is_inc[] = { { ACTION_STD_OK, BUTTON_PLAY, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_POWER, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_settings_r_is_inc */ const struct button_mapping button_context_pitchscreen[] = { @@ -149,7 +149,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_PLAY, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_POWER, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD), }; /* button_context_pitchscreen */ @@ -159,7 +159,7 @@ const struct button_mapping* get_context_mapping(int context) { switch (context) { - case CONTEXT_STD: + case CONTEXT_STD: return button_context_standard; case CONTEXT_WPS: diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c index b68aed8a37..ff87bff7d3 100644 --- a/apps/keymaps/keymap-h1x0_h3x0.c +++ b/apps/keymaps/keymap-h1x0_h3x0.c @@ -100,7 +100,7 @@ const struct button_mapping button_context_list[] = { { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN, BUTTON_ON }, { ACTION_LISTTREE_PGDOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_ON|BUTTON_DOWN }, { ACTION_LISTTREE_PGDOWN, BUTTON_ON|BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_list */ const struct button_mapping button_context_tree[] = { @@ -148,7 +148,7 @@ const struct button_mapping button_context_settings[] = { { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ const struct button_mapping button_context_settings_right_is_inc[] = { @@ -162,12 +162,12 @@ const struct button_mapping button_context_settings_right_is_inc[] = { { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_SETTINGS_RESET, BUTTON_ON, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ const struct button_mapping button_context_colorchooser[] = { @@ -203,7 +203,7 @@ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_pitchscreen[] = { @@ -218,7 +218,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ const struct button_mapping button_context_recscreen[] = { @@ -229,7 +229,7 @@ const struct button_mapping button_context_recscreen[] = { { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ /***************************************************************************** @@ -251,7 +251,7 @@ const struct button_mapping button_context_standard_h100remote[] = { { ACTION_STD_OK, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_standard_h100lcdremote */ const struct button_mapping button_context_standard_h300lcdremote[] = { @@ -268,7 +268,7 @@ const struct button_mapping button_context_standard_h300lcdremote[] = { { ACTION_STD_OK, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, { ACTION_STD_OK, BUTTON_RC_FF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; @@ -302,12 +302,12 @@ const struct button_mapping button_context_wps_remotescommon[] = { const struct button_mapping button_context_wps_h100remote[] = { { ACTION_WPSAB_RESET, BUTTON_RC_ON|BUTTON_RC_MENU, BUTTON_RC_ON }, { ACTION_WPS_ID3SCREEN, BUTTON_RC_ON|BUTTON_RC_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_wps_h300lcdremote[] = { { ACTION_WPSAB_RESET, BUTTON_RC_MENU|BUTTON_RC_ON, BUTTON_RC_MENU }, { ACTION_WPS_ID3SCREEN, BUTTON_RC_MENU|BUTTON_RC_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_list_h100remote[] = { @@ -315,7 +315,7 @@ const struct button_mapping button_context_list_h100remote[] = { { ACTION_LISTTREE_PGUP, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE, BUTTON_NONE }, { ACTION_LISTTREE_PGDOWN, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping *button_context_list_h300lcdremote = @@ -392,7 +392,7 @@ const struct button_mapping button_context_settings_h100remote[] = { { ACTION_NONE, BUTTON_RC_STOP, BUTTON_NONE }, { ACTION_NONE, BUTTON_RC_MENU|BUTTON_REL, BUTTON_NONE }, */ - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ const struct button_mapping button_context_settings_h300lcdremote[] = { @@ -403,7 +403,7 @@ const struct button_mapping button_context_settings_h300lcdremote[] = { { ACTION_NONE, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_NONE, BUTTON_RC_FF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ @@ -418,7 +418,7 @@ const struct button_mapping button_context_settingsgraphical_h100remote[] = { { ACTION_STD_NEXT, BUTTON_RC_BITRATE, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical_h100remote */ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { @@ -431,12 +431,12 @@ const struct button_mapping button_context_settingsgraphical_h300lcdremote[] = { ACTION_STD_NEXT, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RC_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical_h300remote */ const struct button_mapping button_context_yesno_h100remote[] = { { ACTION_YESNO_ACCEPT, BUTTON_RC_MENU, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ const struct button_mapping *button_context_yesno_h300lcdremote = @@ -465,7 +465,7 @@ const struct button_mapping button_context_quickscreen_h100remote[] = { { ACTION_QS_RIGHT, BUTTON_RC_BITRATE|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_quickscreen_h300lcdremote[] = { @@ -479,7 +479,7 @@ const struct button_mapping button_context_quickscreen_h300lcdremote[] = { { ACTION_QS_RIGHT, BUTTON_RC_FF|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MODE, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_pitchscreen_h100remote[] = { @@ -494,7 +494,7 @@ const struct button_mapping button_context_pitchscreen_h100remote[] = { { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { @@ -509,7 +509,7 @@ const struct button_mapping button_context_pitchscreen_h300lcdremote[] = { { ACTION_PS_RESET, BUTTON_RC_ON, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_RC_STOP, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_recscreen_h100remote[] = { @@ -521,7 +521,7 @@ const struct button_mapping button_context_recscreen_h100remote[] = { { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_SOURCE|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen_h100remote */ const struct button_mapping button_context_recscreen_h300lcdremote[] = { @@ -533,7 +533,7 @@ const struct button_mapping button_context_recscreen_h300lcdremote[] = { { ACTION_SETTINGS_DEC, BUTTON_RC_REW, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_RC_REW|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen_h300lcdremote */ diff --git a/apps/keymaps/keymap-ifp7xx.c b/apps/keymaps/keymap-ifp7xx.c index 359aa5b6e2..5ffa71593c 100644 --- a/apps/keymaps/keymap-ifp7xx.c +++ b/apps/keymaps/keymap-ifp7xx.c @@ -79,7 +79,7 @@ const struct button_mapping button_context_settings[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, { ACTION_NONE, BUTTON_RIGHT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ const struct button_mapping button_context_settings_r_is_inc[] = { @@ -92,12 +92,12 @@ const struct button_mapping button_context_settings_r_is_inc[] = { { ACTION_STD_NEXT, BUTTON_DOWN, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ const struct button_mapping button_context_bmark[] = { @@ -116,7 +116,7 @@ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_pitchscreen[] = { @@ -131,7 +131,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_MODE, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c index 4f4ac4ad33..bfef9c153b 100644 --- a/apps/keymaps/keymap-ipod.c +++ b/apps/keymaps/keymap-ipod.c @@ -57,7 +57,7 @@ const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_tree */ const struct button_mapping button_context_tree_scroll_lr[] = { @@ -90,7 +90,7 @@ const struct button_mapping button_context_wps[] = { { ACTION_WPS_MENU, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_WPS_QUICKSCREEN, BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST, }; /* button_context_wps */ const struct button_mapping button_context_settings[] = { @@ -105,12 +105,12 @@ const struct button_mapping button_context_settings[] = { { ACTION_STD_OK, BUTTON_SELECT|BUTTON_REL, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings */ const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ const struct button_mapping button_context_bmark[] = { @@ -127,7 +127,7 @@ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_pitchscreen[] = { @@ -142,7 +142,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchscreen */ /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */ diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c index 141d23b5d1..1a1411093e 100644 --- a/apps/keymaps/keymap-ondio.c +++ b/apps/keymaps/keymap-ondio.c @@ -77,13 +77,13 @@ const struct button_mapping button_context_settings[] = { { ACTION_STD_OK, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_MENU, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_MENU|BUTTON_REL, BUTTON_MENU }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_listtree */ const struct button_mapping button_context_tree_scroll_lr[] = { { ACTION_NONE, BUTTON_LEFT, BUTTON_NONE }, @@ -101,7 +101,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_RIGHT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; struct button_mapping button_context_bmark[] = { @@ -124,7 +124,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_MENU, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_recscreen[] = { @@ -134,7 +134,7 @@ const struct button_mapping button_context_recscreen[] = { { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ const struct button_mapping* get_context_mapping( int context ) diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c index 0681dc2ded..a3165b2498 100644 --- a/apps/keymaps/keymap-player.c +++ b/apps/keymaps/keymap-player.c @@ -69,19 +69,19 @@ static const struct button_mapping button_context_settings[] = { { ACTION_SETTINGS_DEC, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_SETTINGS_DECREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_listtree */ static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ /***************************************************************************** @@ -94,7 +94,7 @@ static const struct button_mapping remote_button_context_standard[] = { { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; static const struct button_mapping remote_button_context_wps[] = { @@ -106,7 +106,7 @@ static const struct button_mapping remote_button_context_wps[] = { { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c index 3e6eda99fc..85c4213cf4 100644 --- a/apps/keymaps/keymap-recorder.c +++ b/apps/keymaps/keymap-recorder.c @@ -91,14 +91,14 @@ static const struct button_mapping button_context_settings[] = { { ACTION_STD_NEXT, BUTTON_RIGHT, BUTTON_NONE }, { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; static const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_ON, BUTTON_NONE }, { ACTION_TREE_STOP, BUTTON_OFF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_listtree */ static const struct button_mapping button_context_tree_scroll_lr[] = { @@ -116,7 +116,7 @@ static const struct button_mapping button_context_tree_scroll_lr[] = { static const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE }, @@ -129,7 +129,7 @@ static const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ static const struct button_mapping button_context_pitchscreen[] = { @@ -144,7 +144,7 @@ static const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_ON, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_OFF, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchcreen */ const struct button_mapping button_context_recscreen[] = { @@ -156,7 +156,7 @@ const struct button_mapping button_context_recscreen[] = { { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ /***************************************************************************** @@ -169,7 +169,7 @@ static const struct button_mapping remote_button_context_standard[] = { { ACTION_STD_CANCEL, BUTTON_RC_STOP, BUTTON_NONE }, { ACTION_STD_OK, BUTTON_RC_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; static const struct button_mapping remote_button_context_wps[] = { @@ -181,7 +181,7 @@ static const struct button_mapping remote_button_context_wps[] = { { ACTION_WPS_VOLDOWN, BUTTON_RC_VOL_DOWN, BUTTON_NONE }, { ACTION_WPS_VOLUP, BUTTON_RC_VOL_UP, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index e92baf4dbe..f7480d0d38 100644 --- a/apps/keymaps/keymap-x5.c +++ b/apps/keymaps/keymap-x5.c @@ -84,7 +84,7 @@ const struct button_mapping button_context_settings[] = { { ACTION_STD_PREV, BUTTON_LEFT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_tree[] = { @@ -92,7 +92,7 @@ const struct button_mapping button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_PLAY|BUTTON_REL, BUTTON_PLAY }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_tree_scroll_lr[] = { @@ -109,7 +109,7 @@ const struct button_mapping button_context_tree_scroll_lr[] = { const struct button_mapping button_context_yesno[] = { { ACTION_YESNO_ACCEPT, BUTTON_SELECT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settings_yesno */ const struct button_mapping button_context_quickscreen[] = { @@ -123,7 +123,7 @@ const struct button_mapping button_context_quickscreen[] = { { ACTION_QS_RIGHT, BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_quickscreen */ const struct button_mapping button_context_settings_r_is_inc[] = { @@ -137,7 +137,7 @@ const struct button_mapping button_context_settings_r_is_inc[] = { { ACTION_STD_NEXTREPEAT, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE }, { ACTION_STD_CANCEL, BUTTON_REC, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_settingsgraphical */ const struct button_mapping button_context_pitchscreen[] = { @@ -152,7 +152,7 @@ const struct button_mapping button_context_pitchscreen[] = { { ACTION_PS_RESET, BUTTON_POWER, BUTTON_NONE }, { ACTION_PS_EXIT, BUTTON_PLAY, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_pitchscreen */ @@ -168,14 +168,14 @@ const struct button_mapping remote_button_context_standard[] = { { ACTION_STD_MENU, BUTTON_RC_MENU|BUTTON_REL, BUTTON_RC_MENU }, { ACTION_STD_QUICKSCREEN,BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping remote_button_context_tree[] = { { ACTION_TREE_WPS, BUTTON_RC_MODE|BUTTON_REL, BUTTON_RC_MODE }, { ACTION_TREE_STOP, BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping remote_button_context_wps[] = { @@ -199,7 +199,7 @@ const struct button_mapping remote_button_context_wps[] = { { ACTION_WPS_QUICKSCREEN, BUTTON_RC_MENU|BUTTON_REPEAT, BUTTON_RC_MENU }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; const struct button_mapping button_context_recscreen[] = { @@ -212,7 +212,7 @@ const struct button_mapping button_context_recscreen[] = { { ACTION_SETTINGS_DEC, BUTTON_LEFT, BUTTON_NONE }, { ACTION_SETTINGS_DEC, BUTTON_LEFT|BUTTON_REPEAT, BUTTON_NONE }, - LAST_ITEM_IN_LIST + LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD) }; /* button_context_recscreen */ -- cgit v1.2.3