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

1 files changed, 8 insertions, 8 deletions

diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 3e6eda9..85c4213 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)
 };