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/keymaps/keymap-x5.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'apps/keymaps/keymap-x5.c') diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c index e92baf4..f7480d0 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.1