* fixed the pitch screen key mappings for all targets, targets require a

mapping to access the screen from the wps


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

24 files changed, 170 insertions, 53 deletions

diff --git a/apps/action.h b/apps/action.h
index 2210bda176..c73a9e4867 100644
--- a/apps/action.h
+++ b/apps/action.h
@@ -46,6 +46,7 @@ enum {
     CONTEXT_YESNOSCREEN, /*NOTE: make sure your target has this and ACTION_YESNO_ACCEPT */
     CONTEXT_BOOKMARKSCREEN, /*NOTE: requires the action_setting_* mappings also */
     CONTEXT_QUICKSCREEN, /* uses ACTION_QS_ defines below */
+    CONTEXT_PITCHSCREEN, /* uses ACTION_PS_ defines below */
 };
 
 
@@ -82,18 +83,14 @@ enum {
     ACTION_WPS_STOP,
     ACTION_WPS_VOLDOWN,
     ACTION_WPS_VOLUP,
-    ACTION_WPS_NEXTDIR,/* optional */
-    ACTION_WPS_PREVDIR,/* optional */
     ACTION_WPS_PITCHSCREEN,/* optional */
     ACTION_WPS_ID3SCREEN,/* optional */
     ACTION_WPS_CONTEXT,
     ACTION_WPS_QUICKSCREEN,/* optional */
     ACTION_WPS_MENU, /*this should be the same as ACTION_STD_MENU */
-    /* following code are for AB mode in wps, 
-       only needed if defined(AB_REPEAT_ENABLE) */
     ACTION_WPSAB_SINGLE, /* No targets use this, but leave n just-in-case! */
-    ACTION_WPSAB_SETA,   /* either #define WPS_AB_SHARE_DIR_BUTTONS        */
-    ACTION_WPSAB_SETB,   /* OR implement ACTION_WPSAB_SET[AB]              */
+    ACTION_WPS_ABSETA_PREVDIR, /* these should be safe to put together seen as */
+    ACTION_WPS_ABSETB_NEXTDIR, /* you shouldnt want to change dir in ab-mode */
     ACTION_WPSAB_RESET,
     
     /* list and tree page up/down */    
@@ -134,6 +131,20 @@ enum {
     ACTION_QS_DOWN,
     ACTION_QS_DOWNINV, /* why is this not called up?? :p */
     
+    /* pitchscreen */
+    /* obviously ignore if you dont have thise screen */
+    ACTION_PS_INC_SMALL,
+    ACTION_PS_INC_BIG,
+    ACTION_PS_DEC_SMALL,
+    ACTION_PS_DEC_BIG,
+    ACTION_PS_NUDGE_LEFT,
+    ACTION_PS_NUDGE_RIGHT,
+    ACTION_PS_NUDGE_LEFTOFF,
+    ACTION_PS_NUDGE_RIGHTOFF,
+    ACTION_PS_RESET,
+    ACTION_PS_EXIT, /* _STD_* isnt going to work here */
+    
+    
 };
 
 struct button_mapping {
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 2b80172ad4..12e120f7d4 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include "config.h"
 
 #include "system.h"
 #include "file.h"
@@ -373,10 +374,11 @@ long gui_wps_show(void)
                 audio_next();
                 break;
                 /* next / prev directories */
-            case ACTION_WPS_NEXTDIR:
+                /* and set A-B markers if in a-b mode */
+            case ACTION_WPS_ABSETB_NEXTDIR:
                 if (global_settings.party_mode)
                     break;
-#if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS)
+#if defined(AB_REPEAT_ENABLE)
                 if (ab_repeat_mode_enabled())
                 {
                     ab_set_B_marker(wps_state.id3->elapsed);
@@ -389,10 +391,10 @@ long gui_wps_show(void)
                     audio_next_dir();
                 }
                 break;
-            case ACTION_WPS_PREVDIR:
+            case ACTION_WPS_ABSETA_PREVDIR:
                 if (global_settings.party_mode)
                     break;
-#if defined(AB_REPEAT_ENABLE) && defined(WPS_AB_SHARE_DIR_BUTTONS)
+#if defined(AB_REPEAT_ENABLE)
                 if (ab_repeat_mode_enabled())
                     ab_set_A_marker(wps_state.id3->elapsed);
                 else
@@ -465,10 +467,10 @@ long gui_wps_show(void)
                 {
                     gui_wps_set_margin(&gui_wps[i]);
                 }
-#endif /* BUTTON_F3 */
+#endif 
                 restore = true;
                 break;
-#endif
+#endif /* BUTTON_F3 */
 
                 /* pitch screen */
 #ifdef HAVE_PITCHSCREEN
@@ -476,6 +478,7 @@ long gui_wps_show(void)
 #ifdef HAVE_LCD_COLOR
                 show_main_backdrop();
 #endif
+                action_signalscreenchange();
                 if (1 == pitch_screen())
                     return SYS_USB_CONNECTED;
 #ifdef HAVE_LCD_COLOR
@@ -505,22 +508,6 @@ long gui_wps_show(void)
                 }
                 ab_set_A_marker(wps_state.id3->elapsed);
                 break;
-
-
-            /* set A marker for A-B repeat */
-            case ACTION_WPSAB_SETA:
-                if (ab_repeat_mode_enabled())
-                    ab_set_A_marker(wps_state.id3->elapsed);
-                break;
-            /* set B marker for A-B repeat and jump to A */
-            case ACTION_WPSAB_SETB:
-                if (ab_repeat_mode_enabled())
-                {
-                    ab_set_B_marker(wps_state.id3->elapsed);
-                    ab_jump_to_A_marker();
-                    update_track = true;
-                }
-                break;
             /* reset A&B markers */
             case ACTION_WPSAB_RESET:
                 if (ab_repeat_mode_enabled())
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:
diff --git a/apps/onplay.c b/apps/onplay.c
index 231e658ed9..106c433d60 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -961,7 +961,7 @@ int onplay(char* file, int attr, int from)
     }
     if (context == CONTEXT_WPS)
     {
-#if (CONFIG_KEYPAD != PLAYER_PAD)
+#ifdef HAVE_PITCHSCREEN
         /* Pitch screen access */
         items[i].desc = ID2P(LANG_PITCH);
         items[i].function = pitch_screen;
diff --git a/apps/screens.c b/apps/screens.c
index 43680e5564..42faac4cfa 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -351,7 +351,7 @@ int charging_screen(void)
 }
 #endif /* CONFIG_CHARGING && !HAVE_POWEROFF_WHILE_CHARGING */
 
-#if (CONFIG_KEYPAD != PLAYER_PAD)
+#ifdef HAVE_PITCHSCREEN
 /* returns:
    0 if no key was pressed
    1 if USB was connected */
@@ -416,19 +416,20 @@ bool pitch_screen(void)
     pcmbuf_set_low_latency(true);
 #endif
 
+    action_signalscreenchange();
     while (!exit)
     {
         pitch_screen_draw(pitch);
 
-        button = get_action(CONTEXT_SETTINGS,TIMEOUT_BLOCK);
+        button = get_action(CONTEXT_PITCHSCREEN,TIMEOUT_BLOCK);
         switch (button) {
-            case ACTION_SETTINGS_INC:
+            case ACTION_PS_DEC_SMALL:
                 if ( pitch < 2000 )
                     pitch++;
                 sound_set_pitch(pitch);
                 break;
 
-            case ACTION_SETTINGS_INCREPEAT:
+            case ACTION_PS_DEC_BIG:
                 if ( pitch < 1990 )
                     pitch += 10;
                 else
@@ -436,13 +437,13 @@ bool pitch_screen(void)
                 sound_set_pitch(pitch);
                 break;
 
-            case ACTION_SETTINGS_DEC:
+            case ACTION_PS_INC_SMALL:
                 if ( pitch > 500 )
                     pitch--;
                 sound_set_pitch(pitch);
                 break;
 
-            case ACTION_SETTINGS_DECREPEAT:
+            case ACTION_PS_INC_BIG:
                 if ( pitch > 510 )
                     pitch -= 10;
                 else
@@ -450,33 +451,32 @@ bool pitch_screen(void)
                 sound_set_pitch(pitch);
                 break;
 
-            case ACTION_STD_NEXT:
+            case ACTION_PS_NUDGE_RIGHT:
                 if ( pitch < 1980 )
                 {
                     pitch += 20;
                     sound_set_pitch(pitch);
-
                     pitch_screen_draw(pitch);
-
-                    pitch -= 20;
-                    sound_set_pitch(pitch);
                 }
                 break;
+            case ACTION_PS_NUDGE_RIGHTOFF:
+                pitch -= 20;
+                sound_set_pitch(pitch);
+                break;
 
-            case ACTION_STD_PREV:
+            case ACTION_PS_NUDGE_LEFT:
                 if ( pitch > 520 )
                 {
                     pitch -= 20;
                     sound_set_pitch(pitch);
-
                     pitch_screen_draw(pitch);
-
-                    pitch += 20;
-                    sound_set_pitch(pitch);
                 }
+            case ACTION_PS_NUDGE_LEFTOFF:
+                pitch += 20;
+                sound_set_pitch(pitch);
                 break;
 
-            case ACTION_STD_OK:
+            case ACTION_PS_RESET:
                 pitch = 1000;
                 sound_set_pitch( pitch );
                 break;
@@ -498,7 +498,7 @@ bool pitch_screen(void)
     action_signalscreenchange();
     return 0;
 }
-#endif
+#endif /* HAVE_PITCHSCREEN */
 
 #ifdef HAVE_QUICKSCREEN
 
diff --git a/apps/screens.h b/apps/screens.h
index deece8784d..c34f612ded 100644
--- a/apps/screens.h
+++ b/apps/screens.h
@@ -33,7 +33,9 @@ void charging_splash(void);
 int mmc_remove_request(void);
 #endif
 
+#ifdef HAVE_PITCHSCREEN
 bool pitch_screen(void);
+#endif
 
 #if CONFIG_KEYPAD == RECORDER_PAD
 extern bool quick_screen_f3(int button_enter);
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 7a78d48822..4009d334ab 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -9,6 +9,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  112
diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 38f26c104b..52f7625760 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -18,6 +18,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  160
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index a9b0ed3039..69fd565c23 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -14,6 +14,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  160
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 2a174bc4e5..a310a4eef3 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -17,6 +17,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  220
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index 40772f7ffa..8a2ed7a29d 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -17,6 +17,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  160
diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 831ff40c1d..7a7000c080 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -14,6 +14,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  160
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 46abbdf72b..163d91c3db 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -14,6 +14,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  160
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index e063e93737..3366baa8ea 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -17,6 +17,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  220
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index c842de4001..12bc658610 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -14,6 +14,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  138
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index ea19f5c985..2b2e967599 100755
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -14,6 +14,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  138
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index 3d4deb3abd..c077c381f8 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -17,6 +17,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  176
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 79ef1a85ac..5cea64deb4 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -17,6 +17,8 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
 
 /* LCD dimensions */
 #define LCD_WIDTH  320
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 3e6ca50877..ec20929b62 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -15,6 +15,9 @@
 /* define this if you have an Ondio style 6-key keyboard */
 #define CONFIG_KEYPAD ONDIO_PAD
 
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 67de4db45c..c6b70e3685 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -12,6 +12,9 @@
 /* define this if you have an Ondio style 6-key keyboard */
 #define CONFIG_KEYPAD ONDIO_PAD
 
+/* define this if you have access to the pitchscreen */
+#define HAVE_PITCHSCREEN
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF