Changed the button action code to allow both single-fire and multi-fire events to be triggered with _REPEAT. Also simplifies the code. * Made the button mapping tables const to save RAM when running rockbox from flash ROM. * Repaired button mappings for Ondio. * Repaired some more button mappings for player. * Added missing TREE_STOP for iriver, and fixed WPS skipping for recorder.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10600 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 26 insertions, 26 deletions

diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index b03dc39..eecd9b9 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -25,65 +25,65 @@
 #include "action.h"
 #include "button.h"
 
-struct button_mapping button_context_standard[]  = {
+const struct button_mapping button_context_standard[]  = {
     { ACTION_STD_PREV,       BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_LEFT },
+    { ACTION_STD_PREVREPEAT, BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_STD_NEXT,       BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
+    { ACTION_STD_NEXTREPEAT, BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
 
-    { ACTION_STD_CONTEXT,    BUTTON_MENU|BUTTON_REPEAT, BUTTON_MENU },    
-    { ACTION_STD_CANCEL,     BUTTON_STOP,                BUTTON_NONE },
-    { ACTION_STD_OK,         BUTTON_PLAY,               BUTTON_NONE },
-    { ACTION_STD_MENU,       BUTTON_MENU|BUTTON_REL,    BUTTON_MENU },
+    { ACTION_STD_CONTEXT,    BUTTON_PLAY|BUTTON_REPEAT, BUTTON_PLAY },
+    { ACTION_STD_CANCEL,     BUTTON_STOP,               BUTTON_NONE },
+    { ACTION_STD_OK,         BUTTON_PLAY|BUTTON_REL,    BUTTON_PLAY },
+    { ACTION_STD_MENU,       BUTTON_MENU,               BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_wps[]  = {
+const struct button_mapping button_context_wps[]  = {
     { ACTION_WPS_PLAY,      BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_LEFT },
-    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_RIGHT },
+    { ACTION_WPS_SKIPNEXT,  BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT },
+    { ACTION_WPS_SKIPPREV,  BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT },
+    { ACTION_WPS_SEEKBACK,  BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,   BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_WPS_STOPSEEK,  BUTTON_LEFT|BUTTON_REL,     BUTTON_LEFT|BUTTON_REPEAT },
     { ACTION_WPS_STOPSEEK,  BUTTON_RIGHT|BUTTON_REL,    BUTTON_RIGHT|BUTTON_REPEAT },
     { ACTION_WPS_STOP,      BUTTON_STOP,                BUTTON_NONE },
     
     { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT,    BUTTON_MENU },
-    { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_MENU|BUTTON_LEFT },
+    { ACTION_WPS_VOLDOWN,   BUTTON_MENU|BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT,   BUTTON_MENU },
-    { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_MENU|BUTTON_RIGHT },
+    { ACTION_WPS_VOLUP,     BUTTON_MENU|BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
     
-    { ACTION_WPS_BROWSE,    BUTTON_ON|BUTTON_REL,     BUTTON_ON },
-    { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REL,   BUTTON_MENU },
-    { ACTION_WPS_CONTEXT,   BUTTON_ON|BUTTON_REPEAT,  BUTTON_ON },
-    { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON,    BUTTON_MENU },
+    { ACTION_WPS_BROWSE,    BUTTON_ON|BUTTON_REL,       BUTTON_ON },
+    { ACTION_WPS_MENU,      BUTTON_MENU|BUTTON_REL,     BUTTON_MENU },
+    { ACTION_WPS_CONTEXT,   BUTTON_PLAY|BUTTON_REPEAT,  BUTTON_PLAY },
+    { ACTION_WPS_ID3SCREEN, BUTTON_MENU|BUTTON_ON,      BUTTON_NONE },
     
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_settings[] = {
+const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_INC,          BUTTON_LEFT,                  BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_LEFT },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_RIGHT,                BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_RIGHT },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,  BUTTON_NONE },
 
     LAST_ITEM_IN_LIST
 };
 
-struct button_mapping button_context_tree[]  = {
-    { ACTION_TREE_WPS,    BUTTON_ON|BUTTON_REL,     BUTTON_NONE },
+const struct button_mapping button_context_tree[]  = {
+    { ACTION_TREE_WPS,      BUTTON_ON,     BUTTON_NONE },
     
     LAST_ITEM_IN_LIST
 }; /* button_context_listtree */
 
-struct button_mapping button_context_yesno[]  = {
-    { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,      BUTTON_NONE },
+const struct button_mapping button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT,  BUTTON_PLAY,   BUTTON_NONE },
     LAST_ITEM_IN_LIST
 }; /* button_context_settings_yesno */
 
-struct button_mapping* get_context_mapping( int context )
+const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
     {