Revert recording/repeat timer for now. It is useful as a feature, but didn't receive enough testing on multiple targets, and fixing it is non-trivial. Later reversal would be complicated because of .lng spreading. * The patch should probably redone in a different way, as it's huge for what it does... * Issues: (1) The repeat timer setting has NULL pointer hits. (2) The multi-int setting screen breaks with proportional fonts, and with somewhat larger fonts. (3) On some targets, all values except the leftmost one are unreachable. * Hint: The timer itself would be much simpler if it'd just store & compare ticks (497 days before it wraps).

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

3 files changed, 3 insertions, 18 deletions

diff --git a/apps/keymaps/keymap-h10.c b/apps/keymaps/keymap-h10.c
index b3586413dd..1a3c81b989 100644
--- a/apps/keymaps/keymap-h10.c
+++ b/apps/keymaps/keymap-h10.c
@@ -121,10 +121,7 @@ static const struct button_mapping button_context_settings[] = {
     { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
     { ACTION_STD_NEXT,          BUTTON_RIGHT,                     BUTTON_NONE },
     { ACTION_STD_NEXTREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,    BUTTON_POWER,                        BUTTON_NONE },
-    { ACTION_NONE,              BUTTON_LEFT|BUTTON_REL,           BUTTON_LEFT },
-    { ACTION_NONE,              BUTTON_RIGHT|BUTTON_REL,          BUTTON_RIGHT },
-    { ACTION_STD_OK,            BUTTON_PLAY,                      BUTTON_NONE },
+    { ACTION_SETTINGS_RESET,    BUTTON_PLAY,                      BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings */
@@ -306,8 +303,6 @@ static const struct button_mapping button_context_bmark[]  = {
 
 const struct button_mapping button_context_recscreen[]  = {
     { ACTION_REC_PAUSE,             BUTTON_PLAY,                BUTTON_NONE },
-    { ACTION_STD_CANCEL,            BUTTON_REW,                 BUTTON_NONE },
-
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 }; /* button_context_recscreen */
diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index d3d5f8d35f..bbec420846 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -439,10 +439,6 @@ static const struct button_mapping button_context_settings_h100remote[]  = {
     { ACTION_SETTINGS_INCREPEAT,    BUTTON_RC_REW|BUTTON_REPEAT,    BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_RC_FF,                   BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT,    BUTTON_RC_FF|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_RC_SOURCE,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_RC_SOURCE|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RC_BITRATE,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RC_BITRATE|BUTTON_REPEAT,     BUTTON_NONE },
 /*    { ACTION_NONE,                  BUTTON_RC_ON,                   BUTTON_NONE },
     { ACTION_NONE,                  BUTTON_RC_STOP,                 BUTTON_NONE },
     { ACTION_NONE,                  BUTTON_RC_MENU|BUTTON_REL,      BUTTON_NONE },
@@ -455,11 +451,8 @@ static const struct button_mapping button_context_settings_h300lcdremote[]  = {
     { ACTION_SETTINGS_INCREPEAT,    BUTTON_RC_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_SETTINGS_DEC,          BUTTON_RC_VOL_DOWN,             BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT,    BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
-    { ACTION_STD_PREV,              BUTTON_RC_REW,                  BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_RC_REW|BUTTON_REPEAT,    BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RC_FF,                   BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RC_FF|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_SETTINGS_RESET,        BUTTON_RC_ON,                   BUTTON_NONE },
+    { ACTION_NONE,                  BUTTON_RC_REW,                  BUTTON_NONE },
+    { ACTION_NONE,                  BUTTON_RC_FF,                   BUTTON_NONE },
     
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings */
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 3dc69d767c..b637e1ddd1 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -219,9 +219,6 @@ static const struct button_mapping button_context_settings[] = {
     { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                BUTTON_NONE },
     { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
     { ACTION_STD_PREV,              BUTTON_LEFT,                BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
-    { ACTION_STD_NEXT,              BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
     { ACTION_STD_CANCEL,            BUTTON_REC,                 BUTTON_NONE },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)