Rename HAVE_PITCHSCREEN to HAVE_PITCHCONTROL

Also move the definition to config.h

Change-Id: I36bb5020c5e06b2344292bc05e8c13ccc7a6a1ff
Reviewed-on: http://gerrit.rockbox.org/234
Reviewed-by: Nils Wallménius <nils@rockbox.org>

98 files changed, 50 insertions, 245 deletions

diff --git a/apps/SOURCES b/apps/SOURCES
index e20f1c961b..1fe66f93a3 100644
--- a/apps/SOURCES
+++ b/apps/SOURCES
@@ -80,7 +80,7 @@ gui/bitmap/list-skinned.c
 gui/charcell/list.c
 #endif
 gui/option_select.c
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 gui/pitchscreen.c
 #endif
 #ifdef HAVE_QUICKSCREEN
diff --git a/apps/bookmark.c b/apps/bookmark.c
index a6e454f439..12ec1edd0f 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -374,13 +374,13 @@ static char* create_bookmark()
     snprintf(global_bookmark, sizeof(global_bookmark),
              /* new optional bookmark token descriptors should be inserted
                 just before the "%s;%s" in this line... */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
              ">%d;%d;%ld;%d;%ld;%d;%d;%ld;%ld;%s;%s",
 #else
              ">%d;%d;%ld;%d;%ld;%d;%d;%s;%s",
 #endif
              /* ... their flags should go here ... */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
              BM_PITCH | BM_SPEED,
 #else
              0,
@@ -392,7 +392,7 @@ static char* create_bookmark()
              global_settings.repeat_mode,
              global_settings.playlist_shuffle,
              /* ...and their values should go here */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
              (long)sound_get_pitch(),
              (long)dsp_get_timestretch(),
 #endif
@@ -954,7 +954,7 @@ static void say_bookmark(const char* bookmark,
 /* ------------------------------------------------------------------------*/
 static bool play_bookmark(const char* bookmark)
 {
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
     /* preset pitch and speed to 100% in case bookmark doesn't have info */
     bm.pitch = sound_get_pitch();
     bm.speed = dsp_get_timestretch();
@@ -964,7 +964,7 @@ static bool play_bookmark(const char* bookmark)
     {
         global_settings.repeat_mode = bm.repeat_mode;
         global_settings.playlist_shuffle = bm.shuffle;
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
         sound_set_pitch(bm.pitch);
         dsp_set_timestretch(bm.speed);
 #endif
diff --git a/apps/features.txt b/apps/features.txt
index 35f7bb50e0..a65744fd5a 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -88,7 +88,7 @@ masd
 morse_input
 #endif
 
-#if defined(HAVE_PITCHSCREEN)
+#if defined(HAVE_PITCHCONTROL)
 pitchscreen
 #endif
 
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 578a729bb3..b550a90073 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -125,7 +125,7 @@ char* get_dir(char* buf, int buf_size, const char* path, int level)
     return buf;
 }
 
-#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL)
 /* A helper to determine the enum value for pitch/speed.
 
    When there are two choices (i.e. boolean), return 1 if the value is
@@ -1462,7 +1462,7 @@ const char *get_token_value(struct gui_wps *gwps,
         }
 #endif  /* (CONFIG_CODEC == SWCODEC) */
 
-#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL)
         case SKIN_TOKEN_SOUND_PITCH:
         {
             int32_t pitch = sound_get_pitch();
@@ -1477,7 +1477,7 @@ const char *get_token_value(struct gui_wps *gwps,
         }
 #endif
 
-#if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHCONTROL)
     case SKIN_TOKEN_SOUND_SPEED:
     {
         int32_t pitch = sound_get_pitch();
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 25c97fe613..1acd00d120 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -1011,7 +1011,7 @@ long gui_wps_show(void)
 #endif /* BUTTON_F3 */
 
                 /* pitch screen */
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
             case ACTION_WPS_PITCHSCREEN:
             {
                 gwps_leave_wps();
@@ -1020,7 +1020,7 @@ long gui_wps_show(void)
                 restore = true;
             }
             break;
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 #ifdef AB_REPEAT_ENABLE
             /* reset A&B markers */
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c
index 8090257a33..d24a9cd695 100644
--- a/apps/menus/sound_menu.c
+++ b/apps/menus/sound_menu.c
@@ -103,7 +103,7 @@ MENUITEM_SETTING(depth_3d, &global_settings.depth_3d, NULL);
               &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain,
               &crossfeed_hf_attenuation, &crossfeed_hf_cutoff);
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 static int timestretch_callback(int action,const struct menu_item_ex *this_item)
 {
     switch (action)
@@ -185,7 +185,7 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio,
 #endif
 #if CONFIG_CODEC == SWCODEC
           ,&crossfeed_menu, &equalizer_menu, &dithering_enabled
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
           ,&timestretch_enabled
 #endif
           ,&compressor_menu
diff --git a/apps/onplay.c b/apps/onplay.c
index 11fffb9312..9152d87bf5 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1000,7 +1000,7 @@ static int browse_id3_wrapper(void)
 /* CONTEXT_WPS items */
 MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO),
                   browse_id3_wrapper, NULL, NULL, Icon_NOICON);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
                   gui_syncpitchscreen_run, NULL, NULL, Icon_Audio);
 #endif
@@ -1189,7 +1189,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
 #endif           
            &browse_id3_item, &list_viewers_item,
            &delete_file_item, &view_cue_item,
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
            &pitch_screen_item,
 #endif
          );
@@ -1283,7 +1283,7 @@ static struct hotkey_assignment hotkey_items[] = {
     { HOTKEY_SHOW_TRACK_INFO,   LANG_MENU_SHOW_ID3_INFO,
             HOTKEY_FUNC(browse_id3, NULL),
             ONPLAY_RELOAD_DIR },
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     { HOTKEY_PITCHSCREEN,       LANG_PITCH,
             HOTKEY_FUNC(gui_syncpitchscreen_run, NULL),
             ONPLAY_RELOAD_DIR },
diff --git a/apps/plugin.c b/apps/plugin.c
index c15731aec5..afb336ebdc 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -568,7 +568,7 @@ static const struct plugin_api rockbox_api = {
     dsp_crossfeed_enable,
     dsp_eq_enable,
     dsp_dither_enable,
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     dsp_set_timestretch,
 #endif
     dsp_configure,
@@ -614,7 +614,7 @@ static const struct plugin_api rockbox_api = {
     mpeg_get_last_header,
 #endif
 #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \
-     (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN)
+     (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL)
     sound_set_pitch,
 #endif
 
diff --git a/apps/plugin.h b/apps/plugin.h
index 3f63b9a749..b1d3c16979 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -685,7 +685,7 @@ struct plugin_api {
     void (*dsp_crossfeed_enable)(bool enable);
     void (*dsp_eq_enable)(bool enable);
     void (*dsp_dither_enable)(bool enable);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     void (*dsp_set_timestretch)(int32_t percent);
 #endif
     intptr_t (*dsp_configure)(struct dsp_config *dsp,
@@ -742,7 +742,7 @@ struct plugin_api {
     unsigned long (*mpeg_get_last_header)(void);
 #endif
 #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \
-     (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN)
+     (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL)
     void (*sound_set_pitch)(int32_t pitch);
 #endif
 
diff --git a/apps/plugins/mpegplayer/audio_thread.c b/apps/plugins/mpegplayer/audio_thread.c
index b06727f759..b00bf7a113 100644
--- a/apps/plugins/mpegplayer/audio_thread.c
+++ b/apps/plugins/mpegplayer/audio_thread.c
@@ -481,7 +481,7 @@ static void audio_thread(void)
     init_mad();
 
     td.dsp = rb->dsp_get_config(CODEC_IDX_AUDIO);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     rb->sound_set_pitch(PITCH_SPEED_100);
     rb->dsp_set_timestretch(PITCH_SPEED_100);
 #endif
diff --git a/apps/rbcodec_helpers.c b/apps/rbcodec_helpers.c
index 3de92f89f9..b412bb3aa4 100644
--- a/apps/rbcodec_helpers.c
+++ b/apps/rbcodec_helpers.c
@@ -26,7 +26,7 @@
 #include "core_alloc.h"
 #include "tdspeed.h"
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 static int handles[4] = { 0, 0, 0, 0 };
 
 static int move_callback(int handle, void *current, void *new)
@@ -100,5 +100,5 @@ void tdspeed_free_buffers(int32_t **buffers, int nbuf)
         buffers[i] = NULL;
     }
 }
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
diff --git a/apps/settings.c b/apps/settings.c
index e885beb302..d777eb1565 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -993,7 +993,7 @@ void settings_apply(bool read_disk)
     }
 
     dsp_dither_enable(global_settings.dithering_enabled);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     dsp_timestretch_enable(global_settings.timestretch_enabled);
 #endif
     dsp_set_compressor(&global_settings.compressor_settings);
diff --git a/apps/settings.h b/apps/settings.h
index 34cc75b116..55d3344cb2 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -341,7 +341,7 @@ struct user_settings
     int  keyclick;          /* keyclick volume */
     int  keyclick_repeats;  /* keyclick on repeats */
     bool dithering_enabled;
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     bool timestretch_enabled;
 #endif
 #endif /* CONFIG_CODEC == SWCODEC */
@@ -733,7 +733,7 @@ struct user_settings
     struct touchscreen_parameter ts_calibration_data;
 #endif
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     /* pitch screen settings */
     bool pitch_mode_semitone;
 #if CONFIG_CODEC == SWCODEC
diff --git a/apps/settings_list.c b/apps/settings_list.c
index c332b47655..c925b3273e 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1474,7 +1474,7 @@ const struct settings_list settings[] = {
     OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false,
                   "dithering enabled", dsp_dither_enable),
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     /* timestretch */
     OFFON_SETTING(F_SOUNDSETTING, timestretch_enabled, LANG_TIMESTRETCH, false,
                   "timestretch enabled", dsp_timestretch_enable),
@@ -1848,7 +1848,7 @@ const struct settings_list settings[] = {
 #endif
     OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL),
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false,
                   "Semitone pitch change", NULL),
 #if CONFIG_CODEC == SWCODEC
diff --git a/firmware/export/config.h b/firmware/export/config.h
index b642775b95..edd3bb2ba5 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1118,4 +1118,9 @@ Lyre prototype 1 */
 #define HAVE_PCM_FULL_DUPLEX
 #endif
 
+#if (CONFIG_CODEC == SWCODEC) || (CONFIG_CODEC == MAS3587F) || \
+    (CONFIG_CODEC == MAS3539F)
+#define HAVE_PITCHCONTROL
+#endif
+
 #endif /* __CONFIG_H__ */
diff --git a/firmware/export/config/android.h b/firmware/export/config/android.h
index c5ef372880..f563743e14 100644
--- a/firmware/export/config/android.h
+++ b/firmware/export/config/android.h
@@ -29,8 +29,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/archosfmrecorder.h b/firmware/export/config/archosfmrecorder.h
index 6b1f07f752..993f473dde 100644
--- a/firmware/export/config/archosfmrecorder.h
+++ b/firmware/export/config/archosfmrecorder.h
@@ -21,8 +21,7 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
+
 /* define this if you have the button bar */
 #define HAVE_BUTTONBAR
 
diff --git a/firmware/export/config/archosondiofm.h b/firmware/export/config/archosondiofm.h
index 1a1115f318..e3ebda032d 100644
--- a/firmware/export/config/archosondiofm.h
+++ b/firmware/export/config/archosondiofm.h
@@ -46,9 +46,6 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* 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/archosondiosp.h b/firmware/export/config/archosondiosp.h
index aad66b7f45..0967b794e2 100644
--- a/firmware/export/config/archosondiosp.h
+++ b/firmware/export/config/archosondiosp.h
@@ -39,9 +39,6 @@
 #define AB_REPEAT_ENABLE
 #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
 
-/* 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/archosrecorder.h b/firmware/export/config/archosrecorder.h
index 6c708fb450..b23c82e5a7 100644
--- a/firmware/export/config/archosrecorder.h
+++ b/firmware/export/config/archosrecorder.h
@@ -21,8 +21,7 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
+
 /* define this if you have the button bar */
 #define HAVE_BUTTONBAR
 
diff --git a/firmware/export/config/archosrecorderv2.h b/firmware/export/config/archosrecorderv2.h
index dae34ef226..17e804d9c4 100644
--- a/firmware/export/config/archosrecorderv2.h
+++ b/firmware/export/config/archosrecorderv2.h
@@ -21,8 +21,7 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
+
 /* define this if you have the button bar */
 #define HAVE_BUTTONBAR
 
diff --git a/firmware/export/config/cowond2.h b/firmware/export/config/cowond2.h
index ea7b5e43da..e94701130f 100644
--- a/firmware/export/config/cowond2.h
+++ b/firmware/export/config/cowond2.h
@@ -48,8 +48,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/creativezv.h b/firmware/export/config/creativezv.h
index 12d02358ab..725a857698 100644
--- a/firmware/export/config/creativezv.h
+++ b/firmware/export/config/creativezv.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/gigabeatfx.h b/firmware/export/config/gigabeatfx.h
index f07169896b..2d1f89149d 100644
--- a/firmware/export/config/gigabeatfx.h
+++ b/firmware/export/config/gigabeatfx.h
@@ -33,9 +33,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/gigabeats.h b/firmware/export/config/gigabeats.h
index 0bcf2b1310..9ee5142b34 100644
--- a/firmware/export/config/gigabeats.h
+++ b/firmware/export/config/gigabeats.h
@@ -37,9 +37,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/gogearhdd1630.h b/firmware/export/config/gogearhdd1630.h
index 6854c9ad3f..7052f2e080 100644
--- a/firmware/export/config/gogearhdd1630.h
+++ b/firmware/export/config/gogearhdd1630.h
@@ -45,9 +45,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/gogearhdd6330.h b/firmware/export/config/gogearhdd6330.h
index a919ad09db..e96b4ab8c6 100644
--- a/firmware/export/config/gogearhdd6330.h
+++ b/firmware/export/config/gogearhdd6330.h
@@ -45,9 +45,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/gogearsa9200.h b/firmware/export/config/gogearsa9200.h
index afb4b55896..a2f0489cef 100644
--- a/firmware/export/config/gogearsa9200.h
+++ b/firmware/export/config/gogearsa9200.h
@@ -29,9 +29,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h
index 5dc716339b..11916a4b83 100644
--- a/firmware/export/config/hifimanhm60x.h
+++ b/firmware/export/config/hifimanhm60x.h
@@ -42,9 +42,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h
index b5e864c478..dfa6b8d13d 100644
--- a/firmware/export/config/hifimanhm801.h
+++ b/firmware/export/config/hifimanhm801.h
@@ -39,9 +39,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/iaudio7.h b/firmware/export/config/iaudio7.h
index 4bf464914d..89151e648a 100644
--- a/firmware/export/config/iaudio7.h
+++ b/firmware/export/config/iaudio7.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you have LCD enable function */
 #define HAVE_LCD_ENABLE
 
diff --git a/firmware/export/config/iaudiom3.h b/firmware/export/config/iaudiom3.h
index 7d2099ae77..f51ae5b975 100644
--- a/firmware/export/config/iaudiom3.h
+++ b/firmware/export/config/iaudiom3.h
@@ -47,9 +47,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/iaudiom5.h b/firmware/export/config/iaudiom5.h
index 1f1e25c568..2cde941ee2 100644
--- a/firmware/export/config/iaudiom5.h
+++ b/firmware/export/config/iaudiom5.h
@@ -51,9 +51,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/iaudiox5.h b/firmware/export/config/iaudiox5.h
index 118bb80ba4..520c2ac641 100644
--- a/firmware/export/config/iaudiox5.h
+++ b/firmware/export/config/iaudiox5.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/ipod1g2g.h b/firmware/export/config/ipod1g2g.h
index 8dccb842ec..4b2af2c3c3 100644
--- a/firmware/export/config/ipod1g2g.h
+++ b/firmware/export/config/ipod1g2g.h
@@ -46,8 +46,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipod3g.h b/firmware/export/config/ipod3g.h
index 28c36dbf74..d6de96bcbf 100644
--- a/firmware/export/config/ipod3g.h
+++ b/firmware/export/config/ipod3g.h
@@ -46,8 +46,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipod4g.h b/firmware/export/config/ipod4g.h
index f3eef03e25..47f15bee9c 100644
--- a/firmware/export/config/ipod4g.h
+++ b/firmware/export/config/ipod4g.h
@@ -48,8 +48,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipod6g.h b/firmware/export/config/ipod6g.h
index 4cace1a2cf..23a6ef91a3 100644
--- a/firmware/export/config/ipod6g.h
+++ b/firmware/export/config/ipod6g.h
@@ -63,9 +63,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/ipodcolor.h b/firmware/export/config/ipodcolor.h
index 0c700cb933..98ba7a0b75 100644
--- a/firmware/export/config/ipodcolor.h
+++ b/firmware/export/config/ipodcolor.h
@@ -45,8 +45,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipodmini1g.h b/firmware/export/config/ipodmini1g.h
index 815b6d2242..6faabf5660 100644
--- a/firmware/export/config/ipodmini1g.h
+++ b/firmware/export/config/ipodmini1g.h
@@ -46,8 +46,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipodmini2g.h b/firmware/export/config/ipodmini2g.h
index 778635aa6a..15e4eafcc1 100644
--- a/firmware/export/config/ipodmini2g.h
+++ b/firmware/export/config/ipodmini2g.h
@@ -46,8 +46,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipodnano1g.h b/firmware/export/config/ipodnano1g.h
index 2c41c05e20..18cb1a52b1 100644
--- a/firmware/export/config/ipodnano1g.h
+++ b/firmware/export/config/ipodnano1g.h
@@ -45,8 +45,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ipodnano2g.h b/firmware/export/config/ipodnano2g.h
index 9163915198..a6222c1db0 100644
--- a/firmware/export/config/ipodnano2g.h
+++ b/firmware/export/config/ipodnano2g.h
@@ -53,9 +53,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/ipodvideo.h b/firmware/export/config/ipodvideo.h
index 76fe510f64..2b6a8a82aa 100644
--- a/firmware/export/config/ipodvideo.h
+++ b/firmware/export/config/ipodvideo.h
@@ -47,8 +47,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/iriverh10.h b/firmware/export/config/iriverh10.h
index a694fa367d..fcb2b7a823 100644
--- a/firmware/export/config/iriverh10.h
+++ b/firmware/export/config/iriverh10.h
@@ -44,9 +44,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/iriverh100.h b/firmware/export/config/iriverh100.h
index dd50d40f3f..97dced732d 100644
--- a/firmware/export/config/iriverh100.h
+++ b/firmware/export/config/iriverh100.h
@@ -34,8 +34,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/iriverh10_5gb.h b/firmware/export/config/iriverh10_5gb.h
index 720ebb1379..4bfdaa324d 100644
--- a/firmware/export/config/iriverh10_5gb.h
+++ b/firmware/export/config/iriverh10_5gb.h
@@ -44,9 +44,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/iriverh120.h b/firmware/export/config/iriverh120.h
index 355a25f0bc..6dccb9f3d0 100644
--- a/firmware/export/config/iriverh120.h
+++ b/firmware/export/config/iriverh120.h
@@ -34,8 +34,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/iriverh300.h b/firmware/export/config/iriverh300.h
index c4cb7d1aac..aab31bc6a9 100644
--- a/firmware/export/config/iriverh300.h
+++ b/firmware/export/config/iriverh300.h
@@ -34,8 +34,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/logikdax.h b/firmware/export/config/logikdax.h
index 3e37cc661a..c3a3873bed 100644
--- a/firmware/export/config/logikdax.h
+++ b/firmware/export/config/logikdax.h
@@ -32,8 +32,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/meizum3.h b/firmware/export/config/meizum3.h
index fd46019bfa..b8b8f5bc2c 100644
--- a/firmware/export/config/meizum3.h
+++ b/firmware/export/config/meizum3.h
@@ -44,9 +44,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/meizum6sl.h b/firmware/export/config/meizum6sl.h
index cdd9984e7c..7db6b9bf36 100644
--- a/firmware/export/config/meizum6sl.h
+++ b/firmware/export/config/meizum6sl.h
@@ -44,9 +44,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/meizum6sp.h b/firmware/export/config/meizum6sp.h
index 1c79169805..47f8cfe4cb 100644
--- a/firmware/export/config/meizum6sp.h
+++ b/firmware/export/config/meizum6sp.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/mini2440.h b/firmware/export/config/mini2440.h
index f042198e2b..d05e76adba 100644
--- a/firmware/export/config/mini2440.h
+++ b/firmware/export/config/mini2440.h
@@ -106,8 +106,7 @@
 #define HAVE_BMP_SCALING
 /* define this to enable JPEG decoding */
 #define HAVE_JPEG
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
+
 #define HAVE_QUICKSCREEN
 
 /* define this if you have a real-time clock */
diff --git a/firmware/export/config/mpiohd200.h b/firmware/export/config/mpiohd200.h
index d40e39104d..ec5a0b3bef 100644
--- a/firmware/export/config/mpiohd200.h
+++ b/firmware/export/config/mpiohd200.h
@@ -47,9 +47,6 @@
 /* define this if you have access to the quickscreen */
 /* #define HAVE_QUICKSCREEN */
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/mpiohd300.h b/firmware/export/config/mpiohd300.h
index c0af8bc85b..79fa97cb03 100644
--- a/firmware/export/config/mpiohd300.h
+++ b/firmware/export/config/mpiohd300.h
@@ -47,9 +47,6 @@
 /* define this if you have access to the quickscreen */
 /* #define HAVE_QUICKSCREEN */
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/mrobe100.h b/firmware/export/config/mrobe100.h
index bdc58f25ea..0b03962a65 100644
--- a/firmware/export/config/mrobe100.h
+++ b/firmware/export/config/mrobe100.h
@@ -18,9 +18,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/mrobe500.h b/firmware/export/config/mrobe500.h
index 3111ab7abd..c2738f94c5 100644
--- a/firmware/export/config/mrobe500.h
+++ b/firmware/export/config/mrobe500.h
@@ -59,9 +59,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/nokian8xx.h b/firmware/export/config/nokian8xx.h
index 50f2971238..78148396f9 100644
--- a/firmware/export/config/nokian8xx.h
+++ b/firmware/export/config/nokian8xx.h
@@ -29,8 +29,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/nokian900.h b/firmware/export/config/nokian900.h
index b200e50bbc..09531eeef5 100644
--- a/firmware/export/config/nokian900.h
+++ b/firmware/export/config/nokian900.h
@@ -29,8 +29,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/ondavx747.h b/firmware/export/config/ondavx747.h
index c144a68f3a..d303ea5925 100644
--- a/firmware/export/config/ondavx747.h
+++ b/firmware/export/config/ondavx747.h
@@ -58,9 +58,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/ondavx767.h b/firmware/export/config/ondavx767.h
index 3bda8fa4c4..c201284843 100644
--- a/firmware/export/config/ondavx767.h
+++ b/firmware/export/config/ondavx767.h
@@ -52,9 +52,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/ondavx777.h b/firmware/export/config/ondavx777.h
index 48ce20ec98..33bf6442af 100644
--- a/firmware/export/config/ondavx777.h
+++ b/firmware/export/config/ondavx777.h
@@ -52,9 +52,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/pandora.h b/firmware/export/config/pandora.h
index a1a2ecb111..2f42bffc3d 100644
--- a/firmware/export/config/pandora.h
+++ b/firmware/export/config/pandora.h
@@ -29,8 +29,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/rk27generic.h b/firmware/export/config/rk27generic.h
index 56d4da8400..1aeb786704 100644
--- a/firmware/export/config/rk27generic.h
+++ b/firmware/export/config/rk27generic.h
@@ -48,9 +48,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/samsungyh820.h b/firmware/export/config/samsungyh820.h
index f2ad6ebc5e..e5100b994f 100644
--- a/firmware/export/config/samsungyh820.h
+++ b/firmware/export/config/samsungyh820.h
@@ -85,9 +85,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/samsungyh920.h b/firmware/export/config/samsungyh920.h
index f6641fab94..5da11fe436 100644
--- a/firmware/export/config/samsungyh920.h
+++ b/firmware/export/config/samsungyh920.h
@@ -85,9 +85,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/samsungyh925.h b/firmware/export/config/samsungyh925.h
index 2d39aaafec..f3e1f455fc 100644
--- a/firmware/export/config/samsungyh925.h
+++ b/firmware/export/config/samsungyh925.h
@@ -82,9 +82,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/samsungypr0.h b/firmware/export/config/samsungypr0.h
index 1741dd9132..48e98e5b46 100644
--- a/firmware/export/config/samsungypr0.h
+++ b/firmware/export/config/samsungypr0.h
@@ -43,9 +43,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/samsungyps3.h b/firmware/export/config/samsungyps3.h
index 93140561eb..93beb5c30d 100644
--- a/firmware/export/config/samsungyps3.h
+++ b/firmware/export/config/samsungyps3.h
@@ -44,9 +44,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansac100.h b/firmware/export/config/sansac100.h
index 960169fab4..cb28768684 100644
--- a/firmware/export/config/sansac100.h
+++ b/firmware/export/config/sansac100.h
@@ -25,9 +25,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansac200.h b/firmware/export/config/sansac200.h
index 259e3803b5..1ee3d124d8 100644
--- a/firmware/export/config/sansac200.h
+++ b/firmware/export/config/sansac200.h
@@ -45,9 +45,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansac200v2.h b/firmware/export/config/sansac200v2.h
index efe48de33d..9779e98a0c 100644
--- a/firmware/export/config/sansac200v2.h
+++ b/firmware/export/config/sansac200v2.h
@@ -47,9 +47,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansaclip.h b/firmware/export/config/sansaclip.h
index 61d3070483..cc84ef3336 100644
--- a/firmware/export/config/sansaclip.h
+++ b/firmware/export/config/sansaclip.h
@@ -35,9 +35,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h
index 0725431e8a..31337f0831 100644
--- a/firmware/export/config/sansaclipplus.h
+++ b/firmware/export/config/sansaclipplus.h
@@ -39,9 +39,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index 1043d28307..a95418f134 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -35,9 +35,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansaclipzip.h b/firmware/export/config/sansaclipzip.h
index 9333e66f0e..c3d0b49068 100644
--- a/firmware/export/config/sansaclipzip.h
+++ b/firmware/export/config/sansaclipzip.h
@@ -51,9 +51,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansaconnect.h b/firmware/export/config/sansaconnect.h
index 0733adb8f9..ad575e2d43 100644
--- a/firmware/export/config/sansaconnect.h
+++ b/firmware/export/config/sansaconnect.h
@@ -60,9 +60,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansae200.h b/firmware/export/config/sansae200.h
index d022f567c6..9d2deb99ce 100644
--- a/firmware/export/config/sansae200.h
+++ b/firmware/export/config/sansae200.h
@@ -45,9 +45,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansae200v2.h b/firmware/export/config/sansae200v2.h
index 0ffb9ce413..ee63c0b393 100644
--- a/firmware/export/config/sansae200v2.h
+++ b/firmware/export/config/sansae200v2.h
@@ -45,9 +45,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansafuze.h b/firmware/export/config/sansafuze.h
index db46b1584b..e697cedaf7 100644
--- a/firmware/export/config/sansafuze.h
+++ b/firmware/export/config/sansafuze.h
@@ -49,9 +49,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansafuzeplus.h b/firmware/export/config/sansafuzeplus.h
index f3f97e45fc..9d7b9bf756 100644
--- a/firmware/export/config/sansafuzeplus.h
+++ b/firmware/export/config/sansafuzeplus.h
@@ -42,9 +42,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansafuzev2.h b/firmware/export/config/sansafuzev2.h
index 92c29194d0..e559647443 100644
--- a/firmware/export/config/sansafuzev2.h
+++ b/firmware/export/config/sansafuzev2.h
@@ -46,9 +46,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sansam200.h b/firmware/export/config/sansam200.h
index d9397e2306..378f79ba2b 100644
--- a/firmware/export/config/sansam200.h
+++ b/firmware/export/config/sansam200.h
@@ -28,8 +28,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/sansam200v4.h b/firmware/export/config/sansam200v4.h
index 2db3d84452..ecf3494c7f 100644
--- a/firmware/export/config/sansam200v4.h
+++ b/firmware/export/config/sansam200v4.h
@@ -39,8 +39,6 @@
 
 /* define this if you have access to the quickscreen */
 //#define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 //#define HAVE_TAGCACHE
diff --git a/firmware/export/config/sansaview.h b/firmware/export/config/sansaview.h
index 71f890e930..2bf76927f4 100644
--- a/firmware/export/config/sansaview.h
+++ b/firmware/export/config/sansaview.h
@@ -40,9 +40,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/sdlapp.h b/firmware/export/config/sdlapp.h
index f6f9cf972d..674edd9e27 100644
--- a/firmware/export/config/sdlapp.h
+++ b/firmware/export/config/sdlapp.h
@@ -29,8 +29,6 @@
 
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
diff --git a/firmware/export/config/tatungtpj1022.h b/firmware/export/config/tatungtpj1022.h
index 13d23ab65d..93905dc78e 100644
--- a/firmware/export/config/tatungtpj1022.h
+++ b/firmware/export/config/tatungtpj1022.h
@@ -33,9 +33,6 @@
 /* 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
 #define LCD_HEIGHT 176
diff --git a/firmware/export/config/vibe500.h b/firmware/export/config/vibe500.h
index 6e5bd0742e..df3475a7e2 100644
--- a/firmware/export/config/vibe500.h
+++ b/firmware/export/config/vibe500.h
@@ -49,9 +49,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/zenvisionm30gb.h b/firmware/export/config/zenvisionm30gb.h
index 904c952b13..4062dbf644 100644
--- a/firmware/export/config/zenvisionm30gb.h
+++ b/firmware/export/config/zenvisionm30gb.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/config/zenvisionm60gb.h b/firmware/export/config/zenvisionm60gb.h
index c186500e6a..2400adac20 100644
--- a/firmware/export/config/zenvisionm60gb.h
+++ b/firmware/export/config/zenvisionm60gb.h
@@ -50,9 +50,6 @@
 /* define this if you have access to the quickscreen */
 #define HAVE_QUICKSCREEN
 
-/* define this if you have access to the pitchscreen */
-#define HAVE_PITCHSCREEN
-
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE
 
diff --git a/firmware/export/sound.h b/firmware/export/sound.h
index 7243f48e79..ba6120ce8f 100644
--- a/firmware/export/sound.h
+++ b/firmware/export/sound.h
@@ -138,11 +138,11 @@ void sound_set_pitch(int32_t pitch);
 int32_t sound_get_pitch(void);
 #endif
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 /* precision of the pitch and speed variables */
 /* One zero per decimal (100 means two decimal places */
 #define PITCH_SPEED_PRECISION 100L
 #define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION)  /* 100% speed */
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 #endif
diff --git a/lib/rbcodec/SOURCES b/lib/rbcodec/SOURCES
index c293f3c028..2762636b43 100644
--- a/lib/rbcodec/SOURCES
+++ b/lib/rbcodec/SOURCES
@@ -14,7 +14,7 @@ dsp/dsp_sample_output.c
 dsp/eq.c
 dsp/lin_resample.c
 dsp/pga.c
-# ifdef HAVE_PITCHSCREEN
+# ifdef HAVE_PITCHCONTROL
 dsp/tdspeed.c
 # endif
 # ifdef HAVE_SW_TONE_CONTROLS
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c
index c87a1d528e..1083215c17 100644
--- a/lib/rbcodec/dsp/dsp_misc.c
+++ b/lib/rbcodec/dsp/dsp_misc.c
@@ -158,7 +158,7 @@ void dsp_replaygain_set_settings(const struct replaygain_settings *settings)
 
 /** Pitch Settings **/
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 static int32_t pitch_ratio = PITCH_SPEED_100;
 
 static void dsp_pitch_update(struct dsp_config *dsp)
@@ -183,7 +183,7 @@ void sound_set_pitch(int32_t percent)
     struct sample_io_data *data = (void *)dsp;
     dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency);
 }
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 /* This is a null-processing stage that monitors as an enabled stage but never
  * becomes active in processing samples. It only hooks messages. */
@@ -208,7 +208,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
         break;
 
     case DSP_RESET:
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
         dsp_pitch_update(dsp);
 #endif
         value = (intptr_t)NULL; /* Default gains */
@@ -216,7 +216,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
         dsp_replaygain_set_gains((void *)value);
         break;
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     case DSP_SET_FREQUENCY:
         dsp_pitch_update(dsp);
         break;
diff --git a/lib/rbcodec/dsp/dsp_misc.h b/lib/rbcodec/dsp/dsp_misc.h
index 1c84fd5a11..d658374eaf 100644
--- a/lib/rbcodec/dsp/dsp_misc.h
+++ b/lib/rbcodec/dsp/dsp_misc.h
@@ -54,10 +54,10 @@ struct dsp_replay_gains
 
 void dsp_replaygain_set_settings(const struct replaygain_settings *settings);
 
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 void sound_set_pitch(int32_t ratio);
 int32_t sound_get_pitch(void);
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
 
 /* Callback for firmware layers to interface */
 int dsp_callback(int msg, intptr_t param);
diff --git a/lib/rbcodec/dsp/dsp_proc_database.h b/lib/rbcodec/dsp/dsp_proc_database.h
index 55f10e684b..c4c93ef2d9 100644
--- a/lib/rbcodec/dsp/dsp_proc_database.h
+++ b/lib/rbcodec/dsp/dsp_proc_database.h
@@ -37,7 +37,7 @@
 DSP_PROC_DB_START
     DSP_PROC_DB_ITEM(MISC_HANDLER)  /* misc stuff (null stage) */
     DSP_PROC_DB_ITEM(PGA)           /* pre-gain amp */
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
     DSP_PROC_DB_ITEM(TIMESTRETCH)   /* time-stretching */
 #endif
     DSP_PROC_DB_ITEM(RESAMPLE)      /* resampler providing NATIVE_FREQUENCY */
diff --git a/lib/rbcodec/dsp/dsp_proc_settings.h b/lib/rbcodec/dsp/dsp_proc_settings.h
index 10bc671b72..26f603b8b1 100644
--- a/lib/rbcodec/dsp/dsp_proc_settings.h
+++ b/lib/rbcodec/dsp/dsp_proc_settings.h
@@ -28,7 +28,7 @@
 #include "dsp_misc.h"
 #include "eq.h"
 #include "pga.h"
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
 #include "tdspeed.h"
 #endif
 #ifdef HAVE_SW_TONE_CONTROLS
diff --git a/lib/rbcodec/rbcodecconfig-example.h b/lib/rbcodec/rbcodecconfig-example.h
index ad0f296a23..2e14f53202 100644
--- a/lib/rbcodec/rbcodecconfig-example.h
+++ b/lib/rbcodec/rbcodecconfig-example.h
@@ -1,7 +1,7 @@
 #ifndef RBCODECCONFIG_H_INCLUDED
 #define RBCODECCONFIG_H_INCLUDED
 
-#define HAVE_PITCHSCREEN
+#define HAVE_PITCHCONTROL
 //#define HAVE_SW_VOLUME_CONTROL
 #define HAVE_SW_TONE_CONTROLS
 #define HAVE_ALBUMART