5 files changed, 93 insertions, 6 deletions

diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index 557feea3ff..a087ea6c55 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -5,6 +5,7 @@
  *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
  *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
  *                     \/            \/     \/    \/            \/
+ * $Id $
  *
  * Copyright (C) 2006 Jonathan Gordon
  *
@@ -61,6 +62,7 @@ const struct button_mapping button_context_standard[]  = {
 
 
 const struct button_mapping button_context_wps[]  = {
+    { ACTION_NONE,              BUTTON_ON,                      BUTTON_NONE },
     { ACTION_WPS_PLAY,          BUTTON_ON|BUTTON_REL,           BUTTON_ON },
     { ACTION_WPS_SKIPNEXT,      BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
     { ACTION_WPS_SKIPPREV,      BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
@@ -68,14 +70,15 @@ const struct button_mapping button_context_wps[]  = {
     { 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_NEXTDIR,       BUTTON_ON|BUTTON_RIGHT,         BUTTON_ON },
-    { ACTION_WPS_PREVDIR,       BUTTON_ON|BUTTON_LEFT,          BUTTON_ON },
+    { ACTION_WPS_ABSETB_NEXTDIR,       BUTTON_ON|BUTTON_RIGHT,         BUTTON_ON },
+    { ACTION_WPS_ABSETA_PREVDIR,       BUTTON_ON|BUTTON_LEFT,          BUTTON_ON },
     { ACTION_WPS_STOP,          BUTTON_OFF,                     BUTTON_NONE },
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REL,         BUTTON_DOWN },
     { ACTION_WPS_VOLDOWN,       BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
     { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REL,           BUTTON_UP },
     { ACTION_WPS_VOLUP,         BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
-    { ACTION_WPS_PITCHSCREEN,   BUTTON_ON|BUTTON_REPEAT,        BUTTON_ON },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_ON|BUTTON_UP,            BUTTON_ON },
+    { ACTION_WPS_PITCHSCREEN,   BUTTON_ON|BUTTON_DOWN,          BUTTON_ON },
     { ACTION_WPS_QUICKSCREEN,   BUTTON_MODE|BUTTON_REPEAT,      BUTTON_MODE },
     { ACTION_WPS_MENU,          BUTTON_MODE|BUTTON_REL,         BUTTON_MODE },
     { ACTION_WPS_CONTEXT,       BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT },
@@ -176,6 +179,21 @@ const struct button_mapping button_context_quickscreen[]  = {
     
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
+
+const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_ON,                  BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_OFF,                 BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_pitchcreen */
 /*****************************************************************************
  *    Remote control mappings 
  *****************************************************************************/
@@ -209,8 +227,8 @@ const struct button_mapping button_context_wps_h100lcdremote[]  = {
     { ACTION_WPS_VOLDOWN,           BUTTON_RC_VOL_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
     { ACTION_WPS_VOLUP,             BUTTON_RC_VOL_UP,                   BUTTON_NONE },
     { ACTION_WPS_VOLUP,             BUTTON_RC_VOL_UP|BUTTON_REPEAT,     BUTTON_NONE },
-    { ACTION_WPS_NEXTDIR,           BUTTON_RC_BITRATE,                  BUTTON_NONE },
-    { ACTION_WPS_PREVDIR,           BUTTON_RC_SOURCE,                   BUTTON_NONE },
+    { ACTION_WPS_ABSETB_NEXTDIR,           BUTTON_RC_BITRATE,                  BUTTON_NONE },
+    { ACTION_WPS_ABSETA_PREVDIR,           BUTTON_RC_SOURCE,                   BUTTON_NONE },
     { ACTION_WPS_PITCHSCREEN,       BUTTON_RC_ON|BUTTON_REPEAT,         BUTTON_RC_ON },
     { ACTION_WPS_QUICKSCREEN,       BUTTON_RC_MODE|BUTTON_REPEAT,       BUTTON_RC_MODE },
     { ACTION_WPS_MENU,              BUTTON_RC_MODE|BUTTON_REL,          BUTTON_RC_MODE },
@@ -383,6 +401,8 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_bmark;
         case CONTEXT_QUICKSCREEN:
             return button_context_quickscreen;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
     } 
     return button_context_standard;
 }
diff --git a/apps/keymaps/keymap-ipod.c b/apps/keymaps/keymap-ipod.c
index 2beb428b6b..96e2f20e9e 100644
--- a/apps/keymaps/keymap-ipod.c
+++ b/apps/keymaps/keymap-ipod.c
@@ -129,6 +129,21 @@ const struct button_mapping button_context_quickscreen[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
+const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_SCROLL_FWD,                BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_SCROLL_FWD|BUTTON_REPEAT,  BUTTON_SCROLL_FWD },
+    { ACTION_PS_DEC_SMALL,      BUTTON_SCROLL_BACK,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_SCROLL_BACK|BUTTON_REPEAT,  BUTTON_SCROLL_BACK },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_MENU,                BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_SELECT,              BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_pitchscreen */
+
 /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
 const struct button_mapping* get_context_mapping(int context)
 {
@@ -158,6 +173,8 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_bmark;
         case CONTEXT_QUICKSCREEN:
             return button_context_quickscreen;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
         default:
             return button_context_standard;
     } 
diff --git a/apps/keymaps/keymap-ondio.c b/apps/keymaps/keymap-ondio.c
index a82d6eb5fa..7ca7d20c83 100644
--- a/apps/keymaps/keymap-ondio.c
+++ b/apps/keymaps/keymap-ondio.c
@@ -111,6 +111,21 @@ struct button_mapping button_context_bmark[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
 
+const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_MENU,                BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_OFF,                 BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_quickscreen */
+
 const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
@@ -129,7 +144,8 @@ const struct button_mapping* get_context_mapping( int context )
             
         case CONTEXT_BOOKMARKSCREEN:
             return button_context_bmark;
-
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
         case CONTEXT_TREE:     
             if (global_settings.hold_lr_for_scroll_in_list)
                 return button_context_tree_scroll_lr;
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index a28286936e..a0a0426d32 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -125,6 +125,21 @@ const struct button_mapping button_context_quickscreen[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
+const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_ON,                  BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_OFF,                 BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_pitchcreen */
+
 const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
@@ -137,6 +152,8 @@ const struct button_mapping* get_context_mapping( int context )
 
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
             
         case CONTEXT_TREE:
             if (global_settings.hold_lr_for_scroll_in_list)
diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 61e20f9d46..d428de0e27 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -124,6 +124,21 @@ const struct button_mapping button_context_quickscreen[]  = {
     LAST_ITEM_IN_LIST
 }; /* button_context_quickscreen */
 
+const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_UP },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_DOWN },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_POWER,               BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_PLAY,                BUTTON_NONE },
+    
+    LAST_ITEM_IN_LIST
+}; /* button_context_pitchscreen */
+
 const struct button_mapping* get_context_mapping( int context )
 {
     switch( context )
@@ -148,6 +163,8 @@ const struct button_mapping* get_context_mapping( int context )
             return button_context_tree;
         case CONTEXT_QUICKSCREEN:
             return button_context_quickscreen;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
         case CONTEXT_LIST:
         case CONTEXT_MAINMENU:
         default: