Bookmark support for I-river remotes, also renamed bookmark delete button as it has changed to RECORD - Sorry Linus ;)

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

2 files changed, 57 insertions, 6 deletions

diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index f5ccfdce70..311ae89ea8 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -254,6 +254,26 @@ const struct button_mapping button_context_settings_h100lcdremote[]  = {
     LAST_ITEM_IN_LIST
 };/*  button_context_settings_h100lcdremote */
 
+const struct button_mapping button_context_settingsgraphical_h100lcdremote[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_RC_FF,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RC_FF|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_RC_REW,                     BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RC_REW|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_RC_VOL_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_RC_VOL_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_settingsgraphical */
+
+const struct button_mapping button_context_bmark_h100lcdremote[]  = {
+    { ACTION_BMARK_DELETE,      BUTTON_RC_REC,    BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_RC_MENU,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
+}; /* button_context_settings_bmark */
+
+
 
 /*********   H300 LCD remote ******/
 const struct button_mapping button_context_standard_h300lcdremote[]  = {
@@ -292,6 +312,25 @@ const struct button_mapping button_context_listtree_h300lcdremote[] = {
 
 }; /* button_context_listtree_h300lcdremote */
 
+const struct button_mapping button_context_settingsgraphical_h300lcdremote[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_RC_FF,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RC_FF|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_RC_REW,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_RC_REW|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_RC_VOL_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_RC_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_RC_VOL_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_settingsgraphical */
+
+const struct button_mapping button_context_bmark_h300lcdremote[]  = {
+    { ACTION_BMARK_DELETE,      BUTTON_RC_REC,    BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_RC_MENU,   BUTTON_NONE },
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGSGRAPHICAL),
+}; /* button_context_settings_bmark */
+
 const struct button_mapping *button_context_settings_h300lcdremote  = 
                                 button_context_settings_h100lcdremote; 
 /* FIXME: non lcd remotes need mappings.. ?? */
@@ -306,7 +345,10 @@ static const struct button_mapping
         *remote_button_context_std = button_context_standard_h100lcdremote, 
         *remote_button_context_wps = button_context_wps_h100lcdremote,
         *remote_button_context_listtree = button_context_listtree_h100lcdremote,
-        *remote_button_context_settings = button_context_settings_h100lcdremote;
+        *remote_button_context_settings = button_context_settings_h100lcdremote,
+        *remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote,
+        *remote_button_context_bmark = button_context_bmark_h100lcdremote;
+        
 static int _remote_type = 0;
 
 static void remap_remote(void)
@@ -319,24 +361,32 @@ static void remap_remote(void)
             remote_button_context_wps = NULL;
             remote_button_context_listtree = NULL;
             remote_button_context_settings = NULL;
+            remote_button_context_settingsgraphical = NULL;
+            remote_button_context_bmark = NULL;
             break;
         case REMOTETYPE_H100_LCD:
             remote_button_context_std = button_context_standard_h100lcdremote;
             remote_button_context_wps = button_context_wps_h100lcdremote;
             remote_button_context_listtree = button_context_listtree_h100lcdremote;
             remote_button_context_settings = button_context_settings_h100lcdremote;
+            remote_button_context_settingsgraphical = button_context_settingsgraphical_h100lcdremote;
+            remote_button_context_bmark = button_context_bmark_h100lcdremote;
             break;
         case REMOTETYPE_H300_LCD:
             remote_button_context_std = button_context_standard_h300lcdremote;
             remote_button_context_wps = button_context_wps_h300lcdremote;
             remote_button_context_listtree = button_context_listtree_h300lcdremote;
             remote_button_context_settings = button_context_settings_h300lcdremote;
+            remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote;
+            remote_button_context_bmark = button_context_bmark_h300lcdremote;
             break;
         case REMOTETYPE_H300_NONLCD: /* FIXME: add its tables */        
             remote_button_context_std = button_context_standard_h300lcdremote;
             remote_button_context_wps = button_context_wps_h300lcdremote;
             remote_button_context_listtree = button_context_listtree_h300lcdremote;
             remote_button_context_settings = button_context_settings_h300lcdremote;
+            remote_button_context_settingsgraphical = button_context_settingsgraphical_h300lcdremote;
+            remote_button_context_bmark = button_context_bmark_h300lcdremote;
             break;
     }
 }
@@ -366,10 +416,12 @@ const struct button_mapping* get_context_mapping_remote(int context)
         case CONTEXT_TREE:
         case CONTEXT_LIST:
             return remote_button_context_listtree;
-
+        case CONTEXT_SETTINGSGRAPHICAL:
+            return remote_button_context_settingsgraphical;
+        case CONTEXT_BOOKMARKSCREEN:
+            return remote_button_context_bmark;
             
         case CONTEXT_YESNOSCREEN:            
-        case CONTEXT_BOOKMARKSCREEN:
             ; /* fall out of the switch */            
     } 
     return remote_button_context_std;
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 5b72b05f32..9b1af8388c 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -4775,11 +4775,10 @@
   desc: Used on the bookmark select window to indicated the bookmark delete option
   user:
   <source>
-    *: "ON+Play = Delete"
+    *: "RECORD = Delete"
   </source>
   <dest>
-    *: "ON+Play = Delete"
-                h100,h120,h300: "ON+NAVI = Delete"
+    *: "RECORD = Delete"
   </dest>
   <voice>
     *: ""