diff options
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 | |||
80 | gui/charcell/list.c | 80 | gui/charcell/list.c |
81 | #endif | 81 | #endif |
82 | gui/option_select.c | 82 | gui/option_select.c |
83 | #ifdef HAVE_PITCHSCREEN | 83 | #ifdef HAVE_PITCHCONTROL |
84 | gui/pitchscreen.c | 84 | gui/pitchscreen.c |
85 | #endif | 85 | #endif |
86 | #ifdef HAVE_QUICKSCREEN | 86 | #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() | |||
374 | snprintf(global_bookmark, sizeof(global_bookmark), | 374 | snprintf(global_bookmark, sizeof(global_bookmark), |
375 | /* new optional bookmark token descriptors should be inserted | 375 | /* new optional bookmark token descriptors should be inserted |
376 | just before the "%s;%s" in this line... */ | 376 | just before the "%s;%s" in this line... */ |
377 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) | 377 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) |
378 | ">%d;%d;%ld;%d;%ld;%d;%d;%ld;%ld;%s;%s", | 378 | ">%d;%d;%ld;%d;%ld;%d;%d;%ld;%ld;%s;%s", |
379 | #else | 379 | #else |
380 | ">%d;%d;%ld;%d;%ld;%d;%d;%s;%s", | 380 | ">%d;%d;%ld;%d;%ld;%d;%d;%s;%s", |
381 | #endif | 381 | #endif |
382 | /* ... their flags should go here ... */ | 382 | /* ... their flags should go here ... */ |
383 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) | 383 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) |
384 | BM_PITCH | BM_SPEED, | 384 | BM_PITCH | BM_SPEED, |
385 | #else | 385 | #else |
386 | 0, | 386 | 0, |
@@ -392,7 +392,7 @@ static char* create_bookmark() | |||
392 | global_settings.repeat_mode, | 392 | global_settings.repeat_mode, |
393 | global_settings.playlist_shuffle, | 393 | global_settings.playlist_shuffle, |
394 | /* ...and their values should go here */ | 394 | /* ...and their values should go here */ |
395 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) | 395 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) |
396 | (long)sound_get_pitch(), | 396 | (long)sound_get_pitch(), |
397 | (long)dsp_get_timestretch(), | 397 | (long)dsp_get_timestretch(), |
398 | #endif | 398 | #endif |
@@ -954,7 +954,7 @@ static void say_bookmark(const char* bookmark, | |||
954 | /* ------------------------------------------------------------------------*/ | 954 | /* ------------------------------------------------------------------------*/ |
955 | static bool play_bookmark(const char* bookmark) | 955 | static bool play_bookmark(const char* bookmark) |
956 | { | 956 | { |
957 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) | 957 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) |
958 | /* preset pitch and speed to 100% in case bookmark doesn't have info */ | 958 | /* preset pitch and speed to 100% in case bookmark doesn't have info */ |
959 | bm.pitch = sound_get_pitch(); | 959 | bm.pitch = sound_get_pitch(); |
960 | bm.speed = dsp_get_timestretch(); | 960 | bm.speed = dsp_get_timestretch(); |
@@ -964,7 +964,7 @@ static bool play_bookmark(const char* bookmark) | |||
964 | { | 964 | { |
965 | global_settings.repeat_mode = bm.repeat_mode; | 965 | global_settings.repeat_mode = bm.repeat_mode; |
966 | global_settings.playlist_shuffle = bm.shuffle; | 966 | global_settings.playlist_shuffle = bm.shuffle; |
967 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN) | 967 | #if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL) |
968 | sound_set_pitch(bm.pitch); | 968 | sound_set_pitch(bm.pitch); |
969 | dsp_set_timestretch(bm.speed); | 969 | dsp_set_timestretch(bm.speed); |
970 | #endif | 970 | #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 | |||
88 | morse_input | 88 | morse_input |
89 | #endif | 89 | #endif |
90 | 90 | ||
91 | #if defined(HAVE_PITCHSCREEN) | 91 | #if defined(HAVE_PITCHCONTROL) |
92 | pitchscreen | 92 | pitchscreen |
93 | #endif | 93 | #endif |
94 | 94 | ||
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) | |||
125 | return buf; | 125 | return buf; |
126 | } | 126 | } |
127 | 127 | ||
128 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN) | 128 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL) |
129 | /* A helper to determine the enum value for pitch/speed. | 129 | /* A helper to determine the enum value for pitch/speed. |
130 | 130 | ||
131 | When there are two choices (i.e. boolean), return 1 if the value is | 131 | 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, | |||
1462 | } | 1462 | } |
1463 | #endif /* (CONFIG_CODEC == SWCODEC) */ | 1463 | #endif /* (CONFIG_CODEC == SWCODEC) */ |
1464 | 1464 | ||
1465 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN) | 1465 | #if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL) |
1466 | case SKIN_TOKEN_SOUND_PITCH: | 1466 | case SKIN_TOKEN_SOUND_PITCH: |
1467 | { | 1467 | { |
1468 | int32_t pitch = sound_get_pitch(); | 1468 | int32_t pitch = sound_get_pitch(); |
@@ -1477,7 +1477,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1477 | } | 1477 | } |
1478 | #endif | 1478 | #endif |
1479 | 1479 | ||
1480 | #if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHSCREEN) | 1480 | #if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHCONTROL) |
1481 | case SKIN_TOKEN_SOUND_SPEED: | 1481 | case SKIN_TOKEN_SOUND_SPEED: |
1482 | { | 1482 | { |
1483 | int32_t pitch = sound_get_pitch(); | 1483 | 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) | |||
1011 | #endif /* BUTTON_F3 */ | 1011 | #endif /* BUTTON_F3 */ |
1012 | 1012 | ||
1013 | /* pitch screen */ | 1013 | /* pitch screen */ |
1014 | #ifdef HAVE_PITCHSCREEN | 1014 | #ifdef HAVE_PITCHCONTROL |
1015 | case ACTION_WPS_PITCHSCREEN: | 1015 | case ACTION_WPS_PITCHSCREEN: |
1016 | { | 1016 | { |
1017 | gwps_leave_wps(); | 1017 | gwps_leave_wps(); |
@@ -1020,7 +1020,7 @@ long gui_wps_show(void) | |||
1020 | restore = true; | 1020 | restore = true; |
1021 | } | 1021 | } |
1022 | break; | 1022 | break; |
1023 | #endif /* HAVE_PITCHSCREEN */ | 1023 | #endif /* HAVE_PITCHCONTROL */ |
1024 | 1024 | ||
1025 | #ifdef AB_REPEAT_ENABLE | 1025 | #ifdef AB_REPEAT_ENABLE |
1026 | /* reset A&B markers */ | 1026 | /* 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); | |||
103 | &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, | 103 | &crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain, |
104 | &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); | 104 | &crossfeed_hf_attenuation, &crossfeed_hf_cutoff); |
105 | 105 | ||
106 | #ifdef HAVE_PITCHSCREEN | 106 | #ifdef HAVE_PITCHCONTROL |
107 | static int timestretch_callback(int action,const struct menu_item_ex *this_item) | 107 | static int timestretch_callback(int action,const struct menu_item_ex *this_item) |
108 | { | 108 | { |
109 | switch (action) | 109 | switch (action) |
@@ -185,7 +185,7 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio, | |||
185 | #endif | 185 | #endif |
186 | #if CONFIG_CODEC == SWCODEC | 186 | #if CONFIG_CODEC == SWCODEC |
187 | ,&crossfeed_menu, &equalizer_menu, &dithering_enabled | 187 | ,&crossfeed_menu, &equalizer_menu, &dithering_enabled |
188 | #ifdef HAVE_PITCHSCREEN | 188 | #ifdef HAVE_PITCHCONTROL |
189 | ,×tretch_enabled | 189 | ,×tretch_enabled |
190 | #endif | 190 | #endif |
191 | ,&compressor_menu | 191 | ,&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) | |||
1000 | /* CONTEXT_WPS items */ | 1000 | /* CONTEXT_WPS items */ |
1001 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), | 1001 | MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO), |
1002 | browse_id3_wrapper, NULL, NULL, Icon_NOICON); | 1002 | browse_id3_wrapper, NULL, NULL, Icon_NOICON); |
1003 | #ifdef HAVE_PITCHSCREEN | 1003 | #ifdef HAVE_PITCHCONTROL |
1004 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), | 1004 | MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH), |
1005 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); | 1005 | gui_syncpitchscreen_run, NULL, NULL, Icon_Audio); |
1006 | #endif | 1006 | #endif |
@@ -1189,7 +1189,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE), | |||
1189 | #endif | 1189 | #endif |
1190 | &browse_id3_item, &list_viewers_item, | 1190 | &browse_id3_item, &list_viewers_item, |
1191 | &delete_file_item, &view_cue_item, | 1191 | &delete_file_item, &view_cue_item, |
1192 | #ifdef HAVE_PITCHSCREEN | 1192 | #ifdef HAVE_PITCHCONTROL |
1193 | &pitch_screen_item, | 1193 | &pitch_screen_item, |
1194 | #endif | 1194 | #endif |
1195 | ); | 1195 | ); |
@@ -1283,7 +1283,7 @@ static struct hotkey_assignment hotkey_items[] = { | |||
1283 | { HOTKEY_SHOW_TRACK_INFO, LANG_MENU_SHOW_ID3_INFO, | 1283 | { HOTKEY_SHOW_TRACK_INFO, LANG_MENU_SHOW_ID3_INFO, |
1284 | HOTKEY_FUNC(browse_id3, NULL), | 1284 | HOTKEY_FUNC(browse_id3, NULL), |
1285 | ONPLAY_RELOAD_DIR }, | 1285 | ONPLAY_RELOAD_DIR }, |
1286 | #ifdef HAVE_PITCHSCREEN | 1286 | #ifdef HAVE_PITCHCONTROL |
1287 | { HOTKEY_PITCHSCREEN, LANG_PITCH, | 1287 | { HOTKEY_PITCHSCREEN, LANG_PITCH, |
1288 | HOTKEY_FUNC(gui_syncpitchscreen_run, NULL), | 1288 | HOTKEY_FUNC(gui_syncpitchscreen_run, NULL), |
1289 | ONPLAY_RELOAD_DIR }, | 1289 | 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 = { | |||
568 | dsp_crossfeed_enable, | 568 | dsp_crossfeed_enable, |
569 | dsp_eq_enable, | 569 | dsp_eq_enable, |
570 | dsp_dither_enable, | 570 | dsp_dither_enable, |
571 | #ifdef HAVE_PITCHSCREEN | 571 | #ifdef HAVE_PITCHCONTROL |
572 | dsp_set_timestretch, | 572 | dsp_set_timestretch, |
573 | #endif | 573 | #endif |
574 | dsp_configure, | 574 | dsp_configure, |
@@ -614,7 +614,7 @@ static const struct plugin_api rockbox_api = { | |||
614 | mpeg_get_last_header, | 614 | mpeg_get_last_header, |
615 | #endif | 615 | #endif |
616 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \ | 616 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \ |
617 | (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN) | 617 | (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL) |
618 | sound_set_pitch, | 618 | sound_set_pitch, |
619 | #endif | 619 | #endif |
620 | 620 | ||
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 { | |||
685 | void (*dsp_crossfeed_enable)(bool enable); | 685 | void (*dsp_crossfeed_enable)(bool enable); |
686 | void (*dsp_eq_enable)(bool enable); | 686 | void (*dsp_eq_enable)(bool enable); |
687 | void (*dsp_dither_enable)(bool enable); | 687 | void (*dsp_dither_enable)(bool enable); |
688 | #ifdef HAVE_PITCHSCREEN | 688 | #ifdef HAVE_PITCHCONTROL |
689 | void (*dsp_set_timestretch)(int32_t percent); | 689 | void (*dsp_set_timestretch)(int32_t percent); |
690 | #endif | 690 | #endif |
691 | intptr_t (*dsp_configure)(struct dsp_config *dsp, | 691 | intptr_t (*dsp_configure)(struct dsp_config *dsp, |
@@ -742,7 +742,7 @@ struct plugin_api { | |||
742 | unsigned long (*mpeg_get_last_header)(void); | 742 | unsigned long (*mpeg_get_last_header)(void); |
743 | #endif | 743 | #endif |
744 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \ | 744 | #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \ |
745 | (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN) | 745 | (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL) |
746 | void (*sound_set_pitch)(int32_t pitch); | 746 | void (*sound_set_pitch)(int32_t pitch); |
747 | #endif | 747 | #endif |
748 | 748 | ||
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) | |||
481 | init_mad(); | 481 | init_mad(); |
482 | 482 | ||
483 | td.dsp = rb->dsp_get_config(CODEC_IDX_AUDIO); | 483 | td.dsp = rb->dsp_get_config(CODEC_IDX_AUDIO); |
484 | #ifdef HAVE_PITCHSCREEN | 484 | #ifdef HAVE_PITCHCONTROL |
485 | rb->sound_set_pitch(PITCH_SPEED_100); | 485 | rb->sound_set_pitch(PITCH_SPEED_100); |
486 | rb->dsp_set_timestretch(PITCH_SPEED_100); | 486 | rb->dsp_set_timestretch(PITCH_SPEED_100); |
487 | #endif | 487 | #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 @@ | |||
26 | #include "core_alloc.h" | 26 | #include "core_alloc.h" |
27 | #include "tdspeed.h" | 27 | #include "tdspeed.h" |
28 | 28 | ||
29 | #ifdef HAVE_PITCHSCREEN | 29 | #ifdef HAVE_PITCHCONTROL |
30 | static int handles[4] = { 0, 0, 0, 0 }; | 30 | static int handles[4] = { 0, 0, 0, 0 }; |
31 | 31 | ||
32 | static int move_callback(int handle, void *current, void *new) | 32 | static int move_callback(int handle, void *current, void *new) |
@@ -100,5 +100,5 @@ void tdspeed_free_buffers(int32_t **buffers, int nbuf) | |||
100 | buffers[i] = NULL; | 100 | buffers[i] = NULL; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | #endif /* HAVE_PITCHSCREEN */ | 103 | #endif /* HAVE_PITCHCONTROL */ |
104 | 104 | ||
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) | |||
993 | } | 993 | } |
994 | 994 | ||
995 | dsp_dither_enable(global_settings.dithering_enabled); | 995 | dsp_dither_enable(global_settings.dithering_enabled); |
996 | #ifdef HAVE_PITCHSCREEN | 996 | #ifdef HAVE_PITCHCONTROL |
997 | dsp_timestretch_enable(global_settings.timestretch_enabled); | 997 | dsp_timestretch_enable(global_settings.timestretch_enabled); |
998 | #endif | 998 | #endif |
999 | dsp_set_compressor(&global_settings.compressor_settings); | 999 | 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 | |||
341 | int keyclick; /* keyclick volume */ | 341 | int keyclick; /* keyclick volume */ |
342 | int keyclick_repeats; /* keyclick on repeats */ | 342 | int keyclick_repeats; /* keyclick on repeats */ |
343 | bool dithering_enabled; | 343 | bool dithering_enabled; |
344 | #ifdef HAVE_PITCHSCREEN | 344 | #ifdef HAVE_PITCHCONTROL |
345 | bool timestretch_enabled; | 345 | bool timestretch_enabled; |
346 | #endif | 346 | #endif |
347 | #endif /* CONFIG_CODEC == SWCODEC */ | 347 | #endif /* CONFIG_CODEC == SWCODEC */ |
@@ -733,7 +733,7 @@ struct user_settings | |||
733 | struct touchscreen_parameter ts_calibration_data; | 733 | struct touchscreen_parameter ts_calibration_data; |
734 | #endif | 734 | #endif |
735 | 735 | ||
736 | #ifdef HAVE_PITCHSCREEN | 736 | #ifdef HAVE_PITCHCONTROL |
737 | /* pitch screen settings */ | 737 | /* pitch screen settings */ |
738 | bool pitch_mode_semitone; | 738 | bool pitch_mode_semitone; |
739 | #if CONFIG_CODEC == SWCODEC | 739 | #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[] = { | |||
1474 | OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false, | 1474 | OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false, |
1475 | "dithering enabled", dsp_dither_enable), | 1475 | "dithering enabled", dsp_dither_enable), |
1476 | 1476 | ||
1477 | #ifdef HAVE_PITCHSCREEN | 1477 | #ifdef HAVE_PITCHCONTROL |
1478 | /* timestretch */ | 1478 | /* timestretch */ |
1479 | OFFON_SETTING(F_SOUNDSETTING, timestretch_enabled, LANG_TIMESTRETCH, false, | 1479 | OFFON_SETTING(F_SOUNDSETTING, timestretch_enabled, LANG_TIMESTRETCH, false, |
1480 | "timestretch enabled", dsp_timestretch_enable), | 1480 | "timestretch enabled", dsp_timestretch_enable), |
@@ -1848,7 +1848,7 @@ const struct settings_list settings[] = { | |||
1848 | #endif | 1848 | #endif |
1849 | OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL), | 1849 | OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL), |
1850 | 1850 | ||
1851 | #ifdef HAVE_PITCHSCREEN | 1851 | #ifdef HAVE_PITCHCONTROL |
1852 | OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false, | 1852 | OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false, |
1853 | "Semitone pitch change", NULL), | 1853 | "Semitone pitch change", NULL), |
1854 | #if CONFIG_CODEC == SWCODEC | 1854 | #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 */ | |||
1118 | #define HAVE_PCM_FULL_DUPLEX | 1118 | #define HAVE_PCM_FULL_DUPLEX |
1119 | #endif | 1119 | #endif |
1120 | 1120 | ||
1121 | #if (CONFIG_CODEC == SWCODEC) || (CONFIG_CODEC == MAS3587F) || \ | ||
1122 | (CONFIG_CODEC == MAS3539F) | ||
1123 | #define HAVE_PITCHCONTROL | ||
1124 | #endif | ||
1125 | |||
1121 | #endif /* __CONFIG_H__ */ | 1126 | #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 @@ | |||
29 | 29 | ||
30 | /* define this if you have access to the quickscreen */ | 30 | /* define this if you have access to the quickscreen */ |
31 | #define HAVE_QUICKSCREEN | 31 | #define HAVE_QUICKSCREEN |
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | 32 | ||
35 | /* define this if you would like tagcache to build on this target */ | 33 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 34 | #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 @@ | |||
21 | 21 | ||
22 | /* define this if you have access to the quickscreen */ | 22 | /* define this if you have access to the quickscreen */ |
23 | #define HAVE_QUICKSCREEN | 23 | #define HAVE_QUICKSCREEN |
24 | /* define this if you have access to the pitchscreen */ | 24 | |
25 | #define HAVE_PITCHSCREEN | ||
26 | /* define this if you have the button bar */ | 25 | /* define this if you have the button bar */ |
27 | #define HAVE_BUTTONBAR | 26 | #define HAVE_BUTTONBAR |
28 | 27 | ||
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 @@ | |||
46 | #define AB_REPEAT_ENABLE | 46 | #define AB_REPEAT_ENABLE |
47 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 47 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
48 | 48 | ||
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | |||
52 | /* Define this if you have a software controlled poweroff */ | 49 | /* Define this if you have a software controlled poweroff */ |
53 | #define HAVE_SW_POWEROFF | 50 | #define HAVE_SW_POWEROFF |
54 | 51 | ||
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 @@ | |||
39 | #define AB_REPEAT_ENABLE | 39 | #define AB_REPEAT_ENABLE |
40 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE | 40 | #define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE |
41 | 41 | ||
42 | /* define this if you have access to the pitchscreen */ | ||
43 | #define HAVE_PITCHSCREEN | ||
44 | |||
45 | /* Define this if you have a software controlled poweroff */ | 42 | /* Define this if you have a software controlled poweroff */ |
46 | #define HAVE_SW_POWEROFF | 43 | #define HAVE_SW_POWEROFF |
47 | 44 | ||
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 @@ | |||
21 | 21 | ||
22 | /* define this if you have access to the quickscreen */ | 22 | /* define this if you have access to the quickscreen */ |
23 | #define HAVE_QUICKSCREEN | 23 | #define HAVE_QUICKSCREEN |
24 | /* define this if you have access to the pitchscreen */ | 24 | |
25 | #define HAVE_PITCHSCREEN | ||
26 | /* define this if you have the button bar */ | 25 | /* define this if you have the button bar */ |
27 | #define HAVE_BUTTONBAR | 26 | #define HAVE_BUTTONBAR |
28 | 27 | ||
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 @@ | |||
21 | 21 | ||
22 | /* define this if you have access to the quickscreen */ | 22 | /* define this if you have access to the quickscreen */ |
23 | #define HAVE_QUICKSCREEN | 23 | #define HAVE_QUICKSCREEN |
24 | /* define this if you have access to the pitchscreen */ | 24 | |
25 | #define HAVE_PITCHSCREEN | ||
26 | /* define this if you have the button bar */ | 25 | /* define this if you have the button bar */ |
27 | #define HAVE_BUTTONBAR | 26 | #define HAVE_BUTTONBAR |
28 | 27 | ||
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 @@ | |||
48 | 48 | ||
49 | /* define this if you have access to the quickscreen */ | 49 | /* define this if you have access to the quickscreen */ |
50 | #define HAVE_QUICKSCREEN | 50 | #define HAVE_QUICKSCREEN |
51 | /* define this if you have access to the pitchscreen */ | ||
52 | #define HAVE_PITCHSCREEN | ||
53 | 51 | ||
54 | /* define this if you would like tagcache to build on this target */ | 52 | /* define this if you would like tagcache to build on this target */ |
55 | #define HAVE_TAGCACHE | 53 | #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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you would like tagcache to build on this target */ | 53 | /* define this if you would like tagcache to build on this target */ |
57 | #define HAVE_TAGCACHE | 54 | #define HAVE_TAGCACHE |
58 | 55 | ||
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 @@ | |||
33 | /* define this if you have access to the quickscreen */ | 33 | /* define this if you have access to the quickscreen */ |
34 | #define HAVE_QUICKSCREEN | 34 | #define HAVE_QUICKSCREEN |
35 | 35 | ||
36 | /* define this if you have access to the pitchscreen */ | ||
37 | #define HAVE_PITCHSCREEN | ||
38 | |||
39 | /* define this if you would like tagcache to build on this target */ | 36 | /* define this if you would like tagcache to build on this target */ |
40 | #define HAVE_TAGCACHE | 37 | #define HAVE_TAGCACHE |
41 | 38 | ||
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 @@ | |||
37 | /* define this if you have access to the quickscreen */ | 37 | /* define this if you have access to the quickscreen */ |
38 | #define HAVE_QUICKSCREEN | 38 | #define HAVE_QUICKSCREEN |
39 | 39 | ||
40 | /* define this if you have access to the pitchscreen */ | ||
41 | #define HAVE_PITCHSCREEN | ||
42 | |||
43 | /* define this if you would like tagcache to build on this target */ | 40 | /* define this if you would like tagcache to build on this target */ |
44 | #define HAVE_TAGCACHE | 41 | #define HAVE_TAGCACHE |
45 | 42 | ||
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 @@ | |||
45 | /* define this if you have access to the quickscreen */ | 45 | /* define this if you have access to the quickscreen */ |
46 | #define HAVE_QUICKSCREEN | 46 | #define HAVE_QUICKSCREEN |
47 | 47 | ||
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | |||
51 | /* define this if you would like tagcache to build on this target */ | 48 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 49 | #define HAVE_TAGCACHE |
53 | 50 | ||
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 @@ | |||
45 | /* define this if you have access to the quickscreen */ | 45 | /* define this if you have access to the quickscreen */ |
46 | #define HAVE_QUICKSCREEN | 46 | #define HAVE_QUICKSCREEN |
47 | 47 | ||
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | |||
51 | /* define this if you would like tagcache to build on this target */ | 48 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 49 | #define HAVE_TAGCACHE |
53 | 50 | ||
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 @@ | |||
29 | /* define this if you have access to the quickscreen */ | 29 | /* define this if you have access to the quickscreen */ |
30 | #define HAVE_QUICKSCREEN | 30 | #define HAVE_QUICKSCREEN |
31 | 31 | ||
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | |||
35 | /* define this if you would like tagcache to build on this target */ | 32 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 33 | #define HAVE_TAGCACHE |
37 | 34 | ||
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 @@ | |||
42 | /* define this if you have access to the quickscreen */ | 42 | /* define this if you have access to the quickscreen */ |
43 | #define HAVE_QUICKSCREEN | 43 | #define HAVE_QUICKSCREEN |
44 | 44 | ||
45 | /* define this if you have access to the pitchscreen */ | ||
46 | #define HAVE_PITCHSCREEN | ||
47 | |||
48 | /* define this if you would like tagcache to build on this target */ | 45 | /* define this if you would like tagcache to build on this target */ |
49 | #define HAVE_TAGCACHE | 46 | #define HAVE_TAGCACHE |
50 | 47 | ||
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 @@ | |||
39 | /* define this if you have access to the quickscreen */ | 39 | /* define this if you have access to the quickscreen */ |
40 | #define HAVE_QUICKSCREEN | 40 | #define HAVE_QUICKSCREEN |
41 | 41 | ||
42 | /* define this if you have access to the pitchscreen */ | ||
43 | #define HAVE_PITCHSCREEN | ||
44 | |||
45 | /* define this if you would like tagcache to build on this target */ | 42 | /* define this if you would like tagcache to build on this target */ |
46 | #define HAVE_TAGCACHE | 43 | #define HAVE_TAGCACHE |
47 | 44 | ||
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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you have LCD enable function */ | 53 | /* define this if you have LCD enable function */ |
57 | #define HAVE_LCD_ENABLE | 54 | #define HAVE_LCD_ENABLE |
58 | 55 | ||
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 @@ | |||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | 49 | ||
50 | /* define this if you have access to the pitchscreen */ | ||
51 | #define HAVE_PITCHSCREEN | ||
52 | |||
53 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
54 | #define HAVE_TAGCACHE | 51 | #define HAVE_TAGCACHE |
55 | 52 | ||
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 @@ | |||
51 | /* define this if you have access to the quickscreen */ | 51 | /* define this if you have access to the quickscreen */ |
52 | #define HAVE_QUICKSCREEN | 52 | #define HAVE_QUICKSCREEN |
53 | 53 | ||
54 | /* define this if you have access to the pitchscreen */ | ||
55 | #define HAVE_PITCHSCREEN | ||
56 | |||
57 | /* define this if you would like tagcache to build on this target */ | 54 | /* define this if you would like tagcache to build on this target */ |
58 | #define HAVE_TAGCACHE | 55 | #define HAVE_TAGCACHE |
59 | 56 | ||
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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you would like tagcache to build on this target */ | 53 | /* define this if you would like tagcache to build on this target */ |
57 | #define HAVE_TAGCACHE | 54 | #define HAVE_TAGCACHE |
58 | 55 | ||
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 @@ | |||
46 | 46 | ||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | 49 | ||
52 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
53 | #define HAVE_TAGCACHE | 51 | #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 @@ | |||
46 | 46 | ||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | 49 | ||
52 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
53 | #define HAVE_TAGCACHE | 51 | #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 @@ | |||
48 | 48 | ||
49 | /* define this if you have access to the quickscreen */ | 49 | /* define this if you have access to the quickscreen */ |
50 | #define HAVE_QUICKSCREEN | 50 | #define HAVE_QUICKSCREEN |
51 | /* define this if you have access to the pitchscreen */ | ||
52 | #define HAVE_PITCHSCREEN | ||
53 | 51 | ||
54 | /* define this if you would like tagcache to build on this target */ | 52 | /* define this if you would like tagcache to build on this target */ |
55 | #define HAVE_TAGCACHE | 53 | #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 @@ | |||
63 | /* define this if you have access to the quickscreen */ | 63 | /* define this if you have access to the quickscreen */ |
64 | #define HAVE_QUICKSCREEN | 64 | #define HAVE_QUICKSCREEN |
65 | 65 | ||
66 | /* define this if you have access to the pitchscreen */ | ||
67 | #define HAVE_PITCHSCREEN | ||
68 | |||
69 | /* define this if you would like tagcache to build on this target */ | 66 | /* define this if you would like tagcache to build on this target */ |
70 | #define HAVE_TAGCACHE | 67 | #define HAVE_TAGCACHE |
71 | 68 | ||
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 @@ | |||
45 | 45 | ||
46 | /* define this if you have access to the quickscreen */ | 46 | /* define this if you have access to the quickscreen */ |
47 | #define HAVE_QUICKSCREEN | 47 | #define HAVE_QUICKSCREEN |
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | 48 | ||
51 | /* define this if you would like tagcache to build on this target */ | 49 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 50 | #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 @@ | |||
46 | 46 | ||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | 49 | ||
52 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
53 | #define HAVE_TAGCACHE | 51 | #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 @@ | |||
46 | 46 | ||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | 49 | ||
52 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
53 | #define HAVE_TAGCACHE | 51 | #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 @@ | |||
45 | 45 | ||
46 | /* define this if you have access to the quickscreen */ | 46 | /* define this if you have access to the quickscreen */ |
47 | #define HAVE_QUICKSCREEN | 47 | #define HAVE_QUICKSCREEN |
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | 48 | ||
51 | /* define this if you would like tagcache to build on this target */ | 49 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 50 | #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 @@ | |||
53 | /* define this if you have access to the quickscreen */ | 53 | /* define this if you have access to the quickscreen */ |
54 | #define HAVE_QUICKSCREEN | 54 | #define HAVE_QUICKSCREEN |
55 | 55 | ||
56 | /* define this if you have access to the pitchscreen */ | ||
57 | #define HAVE_PITCHSCREEN | ||
58 | |||
59 | /* define this if you would like tagcache to build on this target */ | 56 | /* define this if you would like tagcache to build on this target */ |
60 | #define HAVE_TAGCACHE | 57 | #define HAVE_TAGCACHE |
61 | 58 | ||
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 @@ | |||
47 | 47 | ||
48 | /* define this if you have access to the quickscreen */ | 48 | /* define this if you have access to the quickscreen */ |
49 | #define HAVE_QUICKSCREEN | 49 | #define HAVE_QUICKSCREEN |
50 | /* define this if you have access to the pitchscreen */ | ||
51 | #define HAVE_PITCHSCREEN | ||
52 | 50 | ||
53 | /* define this if you would like tagcache to build on this target */ | 51 | /* define this if you would like tagcache to build on this target */ |
54 | #define HAVE_TAGCACHE | 52 | #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 @@ | |||
44 | /* define this if you have access to the quickscreen */ | 44 | /* define this if you have access to the quickscreen */ |
45 | #define HAVE_QUICKSCREEN | 45 | #define HAVE_QUICKSCREEN |
46 | 46 | ||
47 | /* define this if you have access to the pitchscreen */ | ||
48 | #define HAVE_PITCHSCREEN | ||
49 | |||
50 | /* define this if you would like tagcache to build on this target */ | 47 | /* define this if you would like tagcache to build on this target */ |
51 | #define HAVE_TAGCACHE | 48 | #define HAVE_TAGCACHE |
52 | 49 | ||
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 @@ | |||
34 | 34 | ||
35 | /* define this if you have access to the quickscreen */ | 35 | /* define this if you have access to the quickscreen */ |
36 | #define HAVE_QUICKSCREEN | 36 | #define HAVE_QUICKSCREEN |
37 | /* define this if you have access to the pitchscreen */ | ||
38 | #define HAVE_PITCHSCREEN | ||
39 | 37 | ||
40 | /* define this if you would like tagcache to build on this target */ | 38 | /* define this if you would like tagcache to build on this target */ |
41 | #define HAVE_TAGCACHE | 39 | #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 @@ | |||
44 | /* define this if you have access to the quickscreen */ | 44 | /* define this if you have access to the quickscreen */ |
45 | #define HAVE_QUICKSCREEN | 45 | #define HAVE_QUICKSCREEN |
46 | 46 | ||
47 | /* define this if you have access to the pitchscreen */ | ||
48 | #define HAVE_PITCHSCREEN | ||
49 | |||
50 | /* define this if you would like tagcache to build on this target */ | 47 | /* define this if you would like tagcache to build on this target */ |
51 | #define HAVE_TAGCACHE | 48 | #define HAVE_TAGCACHE |
52 | 49 | ||
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 @@ | |||
34 | 34 | ||
35 | /* define this if you have access to the quickscreen */ | 35 | /* define this if you have access to the quickscreen */ |
36 | #define HAVE_QUICKSCREEN | 36 | #define HAVE_QUICKSCREEN |
37 | /* define this if you have access to the pitchscreen */ | ||
38 | #define HAVE_PITCHSCREEN | ||
39 | 37 | ||
40 | /* define this if you would like tagcache to build on this target */ | 38 | /* define this if you would like tagcache to build on this target */ |
41 | #define HAVE_TAGCACHE | 39 | #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 @@ | |||
34 | 34 | ||
35 | /* define this if you have access to the quickscreen */ | 35 | /* define this if you have access to the quickscreen */ |
36 | #define HAVE_QUICKSCREEN | 36 | #define HAVE_QUICKSCREEN |
37 | /* define this if you have access to the pitchscreen */ | ||
38 | #define HAVE_PITCHSCREEN | ||
39 | 37 | ||
40 | /* define this if you would like tagcache to build on this target */ | 38 | /* define this if you would like tagcache to build on this target */ |
41 | #define HAVE_TAGCACHE | 39 | #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 @@ | |||
32 | 32 | ||
33 | /* define this if you have access to the quickscreen */ | 33 | /* define this if you have access to the quickscreen */ |
34 | #define HAVE_QUICKSCREEN | 34 | #define HAVE_QUICKSCREEN |
35 | /* define this if you have access to the pitchscreen */ | ||
36 | #define HAVE_PITCHSCREEN | ||
37 | 35 | ||
38 | /* define this if you would like tagcache to build on this target */ | 36 | /* define this if you would like tagcache to build on this target */ |
39 | #define HAVE_TAGCACHE | 37 | #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 @@ | |||
44 | /* define this if you have access to the quickscreen */ | 44 | /* define this if you have access to the quickscreen */ |
45 | #define HAVE_QUICKSCREEN | 45 | #define HAVE_QUICKSCREEN |
46 | 46 | ||
47 | /* define this if you have access to the pitchscreen */ | ||
48 | #define HAVE_PITCHSCREEN | ||
49 | |||
50 | /* define this if you would like tagcache to build on this target */ | 47 | /* define this if you would like tagcache to build on this target */ |
51 | #define HAVE_TAGCACHE | 48 | #define HAVE_TAGCACHE |
52 | 49 | ||
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 @@ | |||
44 | /* define this if you have access to the quickscreen */ | 44 | /* define this if you have access to the quickscreen */ |
45 | #define HAVE_QUICKSCREEN | 45 | #define HAVE_QUICKSCREEN |
46 | 46 | ||
47 | /* define this if you have access to the pitchscreen */ | ||
48 | #define HAVE_PITCHSCREEN | ||
49 | |||
50 | /* define this if you would like tagcache to build on this target */ | 47 | /* define this if you would like tagcache to build on this target */ |
51 | #define HAVE_TAGCACHE | 48 | #define HAVE_TAGCACHE |
52 | 49 | ||
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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you would like tagcache to build on this target */ | 53 | /* define this if you would like tagcache to build on this target */ |
57 | #define HAVE_TAGCACHE | 54 | #define HAVE_TAGCACHE |
58 | 55 | ||
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 @@ | |||
106 | #define HAVE_BMP_SCALING | 106 | #define HAVE_BMP_SCALING |
107 | /* define this to enable JPEG decoding */ | 107 | /* define this to enable JPEG decoding */ |
108 | #define HAVE_JPEG | 108 | #define HAVE_JPEG |
109 | /* define this if you have access to the pitchscreen */ | 109 | |
110 | #define HAVE_PITCHSCREEN | ||
111 | #define HAVE_QUICKSCREEN | 110 | #define HAVE_QUICKSCREEN |
112 | 111 | ||
113 | /* define this if you have a real-time clock */ | 112 | /* 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 @@ | |||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | /* #define HAVE_QUICKSCREEN */ | 48 | /* #define HAVE_QUICKSCREEN */ |
49 | 49 | ||
50 | /* define this if you have access to the pitchscreen */ | ||
51 | #define HAVE_PITCHSCREEN | ||
52 | |||
53 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
54 | #define HAVE_TAGCACHE | 51 | #define HAVE_TAGCACHE |
55 | 52 | ||
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 @@ | |||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | /* #define HAVE_QUICKSCREEN */ | 48 | /* #define HAVE_QUICKSCREEN */ |
49 | 49 | ||
50 | /* define this if you have access to the pitchscreen */ | ||
51 | #define HAVE_PITCHSCREEN | ||
52 | |||
53 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
54 | #define HAVE_TAGCACHE | 51 | #define HAVE_TAGCACHE |
55 | 52 | ||
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 @@ | |||
18 | /* define this if you have access to the quickscreen */ | 18 | /* define this if you have access to the quickscreen */ |
19 | #define HAVE_QUICKSCREEN | 19 | #define HAVE_QUICKSCREEN |
20 | 20 | ||
21 | /* define this if you have access to the pitchscreen */ | ||
22 | #define HAVE_PITCHSCREEN | ||
23 | |||
24 | /* define this if you would like tagcache to build on this target */ | 21 | /* define this if you would like tagcache to build on this target */ |
25 | #define HAVE_TAGCACHE | 22 | #define HAVE_TAGCACHE |
26 | 23 | ||
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 @@ | |||
59 | /* define this if you have access to the quickscreen */ | 59 | /* define this if you have access to the quickscreen */ |
60 | #define HAVE_QUICKSCREEN | 60 | #define HAVE_QUICKSCREEN |
61 | 61 | ||
62 | /* define this if you have access to the pitchscreen */ | ||
63 | #define HAVE_PITCHSCREEN | ||
64 | |||
65 | /* define this if you would like tagcache to build on this target */ | 62 | /* define this if you would like tagcache to build on this target */ |
66 | #define HAVE_TAGCACHE | 63 | #define HAVE_TAGCACHE |
67 | 64 | ||
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 @@ | |||
29 | 29 | ||
30 | /* define this if you have access to the quickscreen */ | 30 | /* define this if you have access to the quickscreen */ |
31 | #define HAVE_QUICKSCREEN | 31 | #define HAVE_QUICKSCREEN |
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | 32 | ||
35 | /* define this if you would like tagcache to build on this target */ | 33 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 34 | #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 @@ | |||
29 | 29 | ||
30 | /* define this if you have access to the quickscreen */ | 30 | /* define this if you have access to the quickscreen */ |
31 | #define HAVE_QUICKSCREEN | 31 | #define HAVE_QUICKSCREEN |
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | 32 | ||
35 | /* define this if you would like tagcache to build on this target */ | 33 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 34 | #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 @@ | |||
58 | /* define this if you have access to the quickscreen */ | 58 | /* define this if you have access to the quickscreen */ |
59 | #define HAVE_QUICKSCREEN | 59 | #define HAVE_QUICKSCREEN |
60 | 60 | ||
61 | /* define this if you have access to the pitchscreen */ | ||
62 | #define HAVE_PITCHSCREEN | ||
63 | |||
64 | /* define this if you would like tagcache to build on this target */ | 61 | /* define this if you would like tagcache to build on this target */ |
65 | #define HAVE_TAGCACHE | 62 | #define HAVE_TAGCACHE |
66 | 63 | ||
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 @@ | |||
52 | /* define this if you have access to the quickscreen */ | 52 | /* define this if you have access to the quickscreen */ |
53 | #define HAVE_QUICKSCREEN | 53 | #define HAVE_QUICKSCREEN |
54 | 54 | ||
55 | /* define this if you have access to the pitchscreen */ | ||
56 | #define HAVE_PITCHSCREEN | ||
57 | |||
58 | /* define this if you would like tagcache to build on this target */ | 55 | /* define this if you would like tagcache to build on this target */ |
59 | #define HAVE_TAGCACHE | 56 | #define HAVE_TAGCACHE |
60 | 57 | ||
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 @@ | |||
52 | /* define this if you have access to the quickscreen */ | 52 | /* define this if you have access to the quickscreen */ |
53 | #define HAVE_QUICKSCREEN | 53 | #define HAVE_QUICKSCREEN |
54 | 54 | ||
55 | /* define this if you have access to the pitchscreen */ | ||
56 | #define HAVE_PITCHSCREEN | ||
57 | |||
58 | /* define this if you would like tagcache to build on this target */ | 55 | /* define this if you would like tagcache to build on this target */ |
59 | #define HAVE_TAGCACHE | 56 | #define HAVE_TAGCACHE |
60 | 57 | ||
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 @@ | |||
29 | 29 | ||
30 | /* define this if you have access to the quickscreen */ | 30 | /* define this if you have access to the quickscreen */ |
31 | #define HAVE_QUICKSCREEN | 31 | #define HAVE_QUICKSCREEN |
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | 32 | ||
35 | /* define this if you would like tagcache to build on this target */ | 33 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 34 | #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 @@ | |||
48 | /* define this if you have access to the quickscreen */ | 48 | /* define this if you have access to the quickscreen */ |
49 | #define HAVE_QUICKSCREEN | 49 | #define HAVE_QUICKSCREEN |
50 | 50 | ||
51 | /* define this if you have access to the pitchscreen */ | ||
52 | #define HAVE_PITCHSCREEN | ||
53 | |||
54 | /* define this if you would like tagcache to build on this target */ | 51 | /* define this if you would like tagcache to build on this target */ |
55 | #define HAVE_TAGCACHE | 52 | #define HAVE_TAGCACHE |
56 | 53 | ||
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 @@ | |||
85 | /* define this if you have access to the quickscreen */ | 85 | /* define this if you have access to the quickscreen */ |
86 | #define HAVE_QUICKSCREEN | 86 | #define HAVE_QUICKSCREEN |
87 | 87 | ||
88 | /* define this if you have access to the pitchscreen */ | ||
89 | #define HAVE_PITCHSCREEN | ||
90 | |||
91 | /* define this if you would like tagcache to build on this target */ | 88 | /* define this if you would like tagcache to build on this target */ |
92 | #define HAVE_TAGCACHE | 89 | #define HAVE_TAGCACHE |
93 | 90 | ||
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 @@ | |||
85 | /* define this if you have access to the quickscreen */ | 85 | /* define this if you have access to the quickscreen */ |
86 | #define HAVE_QUICKSCREEN | 86 | #define HAVE_QUICKSCREEN |
87 | 87 | ||
88 | /* define this if you have access to the pitchscreen */ | ||
89 | #define HAVE_PITCHSCREEN | ||
90 | |||
91 | /* define this if you would like tagcache to build on this target */ | 88 | /* define this if you would like tagcache to build on this target */ |
92 | #define HAVE_TAGCACHE | 89 | #define HAVE_TAGCACHE |
93 | 90 | ||
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 @@ | |||
82 | /* define this if you have access to the quickscreen */ | 82 | /* define this if you have access to the quickscreen */ |
83 | #define HAVE_QUICKSCREEN | 83 | #define HAVE_QUICKSCREEN |
84 | 84 | ||
85 | /* define this if you have access to the pitchscreen */ | ||
86 | #define HAVE_PITCHSCREEN | ||
87 | |||
88 | /* define this if you would like tagcache to build on this target */ | 85 | /* define this if you would like tagcache to build on this target */ |
89 | #define HAVE_TAGCACHE | 86 | #define HAVE_TAGCACHE |
90 | 87 | ||
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 @@ | |||
43 | /* define this if you have access to the quickscreen */ | 43 | /* define this if you have access to the quickscreen */ |
44 | #define HAVE_QUICKSCREEN | 44 | #define HAVE_QUICKSCREEN |
45 | 45 | ||
46 | /* define this if you have access to the pitchscreen */ | ||
47 | #define HAVE_PITCHSCREEN | ||
48 | |||
49 | /* define this if you would like tagcache to build on this target */ | 46 | /* define this if you would like tagcache to build on this target */ |
50 | #define HAVE_TAGCACHE | 47 | #define HAVE_TAGCACHE |
51 | 48 | ||
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 @@ | |||
44 | /* define this if you have access to the quickscreen */ | 44 | /* define this if you have access to the quickscreen */ |
45 | #define HAVE_QUICKSCREEN | 45 | #define HAVE_QUICKSCREEN |
46 | 46 | ||
47 | /* define this if you have access to the pitchscreen */ | ||
48 | #define HAVE_PITCHSCREEN | ||
49 | |||
50 | /* define this if you would like tagcache to build on this target */ | 47 | /* define this if you would like tagcache to build on this target */ |
51 | #define HAVE_TAGCACHE | 48 | #define HAVE_TAGCACHE |
52 | 49 | ||
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 @@ | |||
25 | /* define this if you have access to the quickscreen */ | 25 | /* define this if you have access to the quickscreen */ |
26 | #define HAVE_QUICKSCREEN | 26 | #define HAVE_QUICKSCREEN |
27 | 27 | ||
28 | /* define this if you have access to the pitchscreen */ | ||
29 | #define HAVE_PITCHSCREEN | ||
30 | |||
31 | /* define this if you would like tagcache to build on this target */ | 28 | /* define this if you would like tagcache to build on this target */ |
32 | #define HAVE_TAGCACHE | 29 | #define HAVE_TAGCACHE |
33 | 30 | ||
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 @@ | |||
45 | /* define this if you have access to the quickscreen */ | 45 | /* define this if you have access to the quickscreen */ |
46 | #define HAVE_QUICKSCREEN | 46 | #define HAVE_QUICKSCREEN |
47 | 47 | ||
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | |||
51 | /* define this if you would like tagcache to build on this target */ | 48 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 49 | #define HAVE_TAGCACHE |
53 | 50 | ||
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 @@ | |||
47 | /* define this if you have access to the quickscreen */ | 47 | /* define this if you have access to the quickscreen */ |
48 | #define HAVE_QUICKSCREEN | 48 | #define HAVE_QUICKSCREEN |
49 | 49 | ||
50 | /* define this if you have access to the pitchscreen */ | ||
51 | #define HAVE_PITCHSCREEN | ||
52 | |||
53 | /* define this if you would like tagcache to build on this target */ | 50 | /* define this if you would like tagcache to build on this target */ |
54 | #define HAVE_TAGCACHE | 51 | #define HAVE_TAGCACHE |
55 | 52 | ||
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 @@ | |||
35 | /* define this if you have access to the quickscreen */ | 35 | /* define this if you have access to the quickscreen */ |
36 | #define HAVE_QUICKSCREEN | 36 | #define HAVE_QUICKSCREEN |
37 | 37 | ||
38 | /* define this if you have access to the pitchscreen */ | ||
39 | #define HAVE_PITCHSCREEN | ||
40 | |||
41 | /* define this if you would like tagcache to build on this target */ | 38 | /* define this if you would like tagcache to build on this target */ |
42 | #define HAVE_TAGCACHE | 39 | #define HAVE_TAGCACHE |
43 | 40 | ||
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 @@ | |||
39 | /* define this if you have access to the quickscreen */ | 39 | /* define this if you have access to the quickscreen */ |
40 | #define HAVE_QUICKSCREEN | 40 | #define HAVE_QUICKSCREEN |
41 | 41 | ||
42 | /* define this if you have access to the pitchscreen */ | ||
43 | #define HAVE_PITCHSCREEN | ||
44 | |||
45 | /* define this if you would like tagcache to build on this target */ | 42 | /* define this if you would like tagcache to build on this target */ |
46 | #define HAVE_TAGCACHE | 43 | #define HAVE_TAGCACHE |
47 | 44 | ||
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 @@ | |||
35 | /* define this if you have access to the quickscreen */ | 35 | /* define this if you have access to the quickscreen */ |
36 | #define HAVE_QUICKSCREEN | 36 | #define HAVE_QUICKSCREEN |
37 | 37 | ||
38 | /* define this if you have access to the pitchscreen */ | ||
39 | #define HAVE_PITCHSCREEN | ||
40 | |||
41 | /* define this if you would like tagcache to build on this target */ | 38 | /* define this if you would like tagcache to build on this target */ |
42 | #define HAVE_TAGCACHE | 39 | #define HAVE_TAGCACHE |
43 | 40 | ||
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 @@ | |||
51 | /* define this if you have access to the quickscreen */ | 51 | /* define this if you have access to the quickscreen */ |
52 | #define HAVE_QUICKSCREEN | 52 | #define HAVE_QUICKSCREEN |
53 | 53 | ||
54 | /* define this if you have access to the pitchscreen */ | ||
55 | #define HAVE_PITCHSCREEN | ||
56 | |||
57 | /* define this if you would like tagcache to build on this target */ | 54 | /* define this if you would like tagcache to build on this target */ |
58 | #define HAVE_TAGCACHE | 55 | #define HAVE_TAGCACHE |
59 | 56 | ||
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 @@ | |||
60 | /* define this if you have access to the quickscreen */ | 60 | /* define this if you have access to the quickscreen */ |
61 | #define HAVE_QUICKSCREEN | 61 | #define HAVE_QUICKSCREEN |
62 | 62 | ||
63 | /* define this if you have access to the pitchscreen */ | ||
64 | #define HAVE_PITCHSCREEN | ||
65 | |||
66 | /* define this if you would like tagcache to build on this target */ | 63 | /* define this if you would like tagcache to build on this target */ |
67 | #define HAVE_TAGCACHE | 64 | #define HAVE_TAGCACHE |
68 | 65 | ||
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 @@ | |||
45 | /* define this if you have access to the quickscreen */ | 45 | /* define this if you have access to the quickscreen */ |
46 | #define HAVE_QUICKSCREEN | 46 | #define HAVE_QUICKSCREEN |
47 | 47 | ||
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | |||
51 | /* define this if you would like tagcache to build on this target */ | 48 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 49 | #define HAVE_TAGCACHE |
53 | 50 | ||
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 @@ | |||
45 | /* define this if you have access to the quickscreen */ | 45 | /* define this if you have access to the quickscreen */ |
46 | #define HAVE_QUICKSCREEN | 46 | #define HAVE_QUICKSCREEN |
47 | 47 | ||
48 | /* define this if you have access to the pitchscreen */ | ||
49 | #define HAVE_PITCHSCREEN | ||
50 | |||
51 | /* define this if you would like tagcache to build on this target */ | 48 | /* define this if you would like tagcache to build on this target */ |
52 | #define HAVE_TAGCACHE | 49 | #define HAVE_TAGCACHE |
53 | 50 | ||
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 @@ | |||
49 | /* define this if you have access to the quickscreen */ | 49 | /* define this if you have access to the quickscreen */ |
50 | #define HAVE_QUICKSCREEN | 50 | #define HAVE_QUICKSCREEN |
51 | 51 | ||
52 | /* define this if you have access to the pitchscreen */ | ||
53 | #define HAVE_PITCHSCREEN | ||
54 | |||
55 | /* define this if you would like tagcache to build on this target */ | 52 | /* define this if you would like tagcache to build on this target */ |
56 | #define HAVE_TAGCACHE | 53 | #define HAVE_TAGCACHE |
57 | 54 | ||
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 @@ | |||
42 | /* define this if you have access to the quickscreen */ | 42 | /* define this if you have access to the quickscreen */ |
43 | #define HAVE_QUICKSCREEN | 43 | #define HAVE_QUICKSCREEN |
44 | 44 | ||
45 | /* define this if you have access to the pitchscreen */ | ||
46 | #define HAVE_PITCHSCREEN | ||
47 | |||
48 | /* define this if you would like tagcache to build on this target */ | 45 | /* define this if you would like tagcache to build on this target */ |
49 | #define HAVE_TAGCACHE | 46 | #define HAVE_TAGCACHE |
50 | 47 | ||
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 @@ | |||
46 | /* define this if you have access to the quickscreen */ | 46 | /* define this if you have access to the quickscreen */ |
47 | #define HAVE_QUICKSCREEN | 47 | #define HAVE_QUICKSCREEN |
48 | 48 | ||
49 | /* define this if you have access to the pitchscreen */ | ||
50 | #define HAVE_PITCHSCREEN | ||
51 | |||
52 | /* define this if you would like tagcache to build on this target */ | 49 | /* define this if you would like tagcache to build on this target */ |
53 | #define HAVE_TAGCACHE | 50 | #define HAVE_TAGCACHE |
54 | 51 | ||
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 @@ | |||
28 | 28 | ||
29 | /* define this if you have access to the quickscreen */ | 29 | /* define this if you have access to the quickscreen */ |
30 | #define HAVE_QUICKSCREEN | 30 | #define HAVE_QUICKSCREEN |
31 | /* define this if you have access to the pitchscreen */ | ||
32 | #define HAVE_PITCHSCREEN | ||
33 | 31 | ||
34 | /* define this if you would like tagcache to build on this target */ | 32 | /* define this if you would like tagcache to build on this target */ |
35 | #define HAVE_TAGCACHE | 33 | #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 @@ | |||
39 | 39 | ||
40 | /* define this if you have access to the quickscreen */ | 40 | /* define this if you have access to the quickscreen */ |
41 | //#define HAVE_QUICKSCREEN | 41 | //#define HAVE_QUICKSCREEN |
42 | /* define this if you have access to the pitchscreen */ | ||
43 | #define HAVE_PITCHSCREEN | ||
44 | 42 | ||
45 | /* define this if you would like tagcache to build on this target */ | 43 | /* define this if you would like tagcache to build on this target */ |
46 | //#define HAVE_TAGCACHE | 44 | //#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 @@ | |||
40 | /* define this if you have access to the quickscreen */ | 40 | /* define this if you have access to the quickscreen */ |
41 | #define HAVE_QUICKSCREEN | 41 | #define HAVE_QUICKSCREEN |
42 | 42 | ||
43 | /* define this if you have access to the pitchscreen */ | ||
44 | #define HAVE_PITCHSCREEN | ||
45 | |||
46 | /* define this if you would like tagcache to build on this target */ | 43 | /* define this if you would like tagcache to build on this target */ |
47 | #define HAVE_TAGCACHE | 44 | #define HAVE_TAGCACHE |
48 | 45 | ||
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 @@ | |||
29 | 29 | ||
30 | /* define this if you have access to the quickscreen */ | 30 | /* define this if you have access to the quickscreen */ |
31 | #define HAVE_QUICKSCREEN | 31 | #define HAVE_QUICKSCREEN |
32 | /* define this if you have access to the pitchscreen */ | ||
33 | #define HAVE_PITCHSCREEN | ||
34 | 32 | ||
35 | /* define this if you would like tagcache to build on this target */ | 33 | /* define this if you would like tagcache to build on this target */ |
36 | #define HAVE_TAGCACHE | 34 | #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 @@ | |||
33 | /* define this if you have access to the quickscreen */ | 33 | /* define this if you have access to the quickscreen */ |
34 | #define HAVE_QUICKSCREEN | 34 | #define HAVE_QUICKSCREEN |
35 | 35 | ||
36 | /* define this if you have access to the pitchscreen */ | ||
37 | #define HAVE_PITCHSCREEN | ||
38 | |||
39 | /* LCD dimensions */ | 36 | /* LCD dimensions */ |
40 | #define LCD_WIDTH 220 | 37 | #define LCD_WIDTH 220 |
41 | #define LCD_HEIGHT 176 | 38 | #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 @@ | |||
49 | /* define this if you have access to the quickscreen */ | 49 | /* define this if you have access to the quickscreen */ |
50 | #define HAVE_QUICKSCREEN | 50 | #define HAVE_QUICKSCREEN |
51 | 51 | ||
52 | /* define this if you have access to the pitchscreen */ | ||
53 | #define HAVE_PITCHSCREEN | ||
54 | |||
55 | /* define this if you would like tagcache to build on this target */ | 52 | /* define this if you would like tagcache to build on this target */ |
56 | #define HAVE_TAGCACHE | 53 | #define HAVE_TAGCACHE |
57 | 54 | ||
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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you would like tagcache to build on this target */ | 53 | /* define this if you would like tagcache to build on this target */ |
57 | #define HAVE_TAGCACHE | 54 | #define HAVE_TAGCACHE |
58 | 55 | ||
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 @@ | |||
50 | /* define this if you have access to the quickscreen */ | 50 | /* define this if you have access to the quickscreen */ |
51 | #define HAVE_QUICKSCREEN | 51 | #define HAVE_QUICKSCREEN |
52 | 52 | ||
53 | /* define this if you have access to the pitchscreen */ | ||
54 | #define HAVE_PITCHSCREEN | ||
55 | |||
56 | /* define this if you would like tagcache to build on this target */ | 53 | /* define this if you would like tagcache to build on this target */ |
57 | #define HAVE_TAGCACHE | 54 | #define HAVE_TAGCACHE |
58 | 55 | ||
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); | |||
138 | int32_t sound_get_pitch(void); | 138 | int32_t sound_get_pitch(void); |
139 | #endif | 139 | #endif |
140 | 140 | ||
141 | #ifdef HAVE_PITCHSCREEN | 141 | #ifdef HAVE_PITCHCONTROL |
142 | /* precision of the pitch and speed variables */ | 142 | /* precision of the pitch and speed variables */ |
143 | /* One zero per decimal (100 means two decimal places */ | 143 | /* One zero per decimal (100 means two decimal places */ |
144 | #define PITCH_SPEED_PRECISION 100L | 144 | #define PITCH_SPEED_PRECISION 100L |
145 | #define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION) /* 100% speed */ | 145 | #define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION) /* 100% speed */ |
146 | #endif /* HAVE_PITCHSCREEN */ | 146 | #endif /* HAVE_PITCHCONTROL */ |
147 | 147 | ||
148 | #endif | 148 | #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 | |||
14 | dsp/eq.c | 14 | dsp/eq.c |
15 | dsp/lin_resample.c | 15 | dsp/lin_resample.c |
16 | dsp/pga.c | 16 | dsp/pga.c |
17 | # ifdef HAVE_PITCHSCREEN | 17 | # ifdef HAVE_PITCHCONTROL |
18 | dsp/tdspeed.c | 18 | dsp/tdspeed.c |
19 | # endif | 19 | # endif |
20 | # ifdef HAVE_SW_TONE_CONTROLS | 20 | # 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) | |||
158 | 158 | ||
159 | /** Pitch Settings **/ | 159 | /** Pitch Settings **/ |
160 | 160 | ||
161 | #ifdef HAVE_PITCHSCREEN | 161 | #ifdef HAVE_PITCHCONTROL |
162 | static int32_t pitch_ratio = PITCH_SPEED_100; | 162 | static int32_t pitch_ratio = PITCH_SPEED_100; |
163 | 163 | ||
164 | static void dsp_pitch_update(struct dsp_config *dsp) | 164 | static void dsp_pitch_update(struct dsp_config *dsp) |
@@ -183,7 +183,7 @@ void sound_set_pitch(int32_t percent) | |||
183 | struct sample_io_data *data = (void *)dsp; | 183 | struct sample_io_data *data = (void *)dsp; |
184 | dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency); | 184 | dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency); |
185 | } | 185 | } |
186 | #endif /* HAVE_PITCHSCREEN */ | 186 | #endif /* HAVE_PITCHCONTROL */ |
187 | 187 | ||
188 | /* This is a null-processing stage that monitors as an enabled stage but never | 188 | /* This is a null-processing stage that monitors as an enabled stage but never |
189 | * becomes active in processing samples. It only hooks messages. */ | 189 | * becomes active in processing samples. It only hooks messages. */ |
@@ -208,7 +208,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this, | |||
208 | break; | 208 | break; |
209 | 209 | ||
210 | case DSP_RESET: | 210 | case DSP_RESET: |
211 | #ifdef HAVE_PITCHSCREEN | 211 | #ifdef HAVE_PITCHCONTROL |
212 | dsp_pitch_update(dsp); | 212 | dsp_pitch_update(dsp); |
213 | #endif | 213 | #endif |
214 | value = (intptr_t)NULL; /* Default gains */ | 214 | value = (intptr_t)NULL; /* Default gains */ |
@@ -216,7 +216,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this, | |||
216 | dsp_replaygain_set_gains((void *)value); | 216 | dsp_replaygain_set_gains((void *)value); |
217 | break; | 217 | break; |
218 | 218 | ||
219 | #ifdef HAVE_PITCHSCREEN | 219 | #ifdef HAVE_PITCHCONTROL |
220 | case DSP_SET_FREQUENCY: | 220 | case DSP_SET_FREQUENCY: |
221 | dsp_pitch_update(dsp); | 221 | dsp_pitch_update(dsp); |
222 | break; | 222 | 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 | |||
54 | 54 | ||
55 | void dsp_replaygain_set_settings(const struct replaygain_settings *settings); | 55 | void dsp_replaygain_set_settings(const struct replaygain_settings *settings); |
56 | 56 | ||
57 | #ifdef HAVE_PITCHSCREEN | 57 | #ifdef HAVE_PITCHCONTROL |
58 | void sound_set_pitch(int32_t ratio); | 58 | void sound_set_pitch(int32_t ratio); |
59 | int32_t sound_get_pitch(void); | 59 | int32_t sound_get_pitch(void); |
60 | #endif /* HAVE_PITCHSCREEN */ | 60 | #endif /* HAVE_PITCHCONTROL */ |
61 | 61 | ||
62 | /* Callback for firmware layers to interface */ | 62 | /* Callback for firmware layers to interface */ |
63 | int dsp_callback(int msg, intptr_t param); | 63 | 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 @@ | |||
37 | DSP_PROC_DB_START | 37 | DSP_PROC_DB_START |
38 | DSP_PROC_DB_ITEM(MISC_HANDLER) /* misc stuff (null stage) */ | 38 | DSP_PROC_DB_ITEM(MISC_HANDLER) /* misc stuff (null stage) */ |
39 | DSP_PROC_DB_ITEM(PGA) /* pre-gain amp */ | 39 | DSP_PROC_DB_ITEM(PGA) /* pre-gain amp */ |
40 | #ifdef HAVE_PITCHSCREEN | 40 | #ifdef HAVE_PITCHCONTROL |
41 | DSP_PROC_DB_ITEM(TIMESTRETCH) /* time-stretching */ | 41 | DSP_PROC_DB_ITEM(TIMESTRETCH) /* time-stretching */ |
42 | #endif | 42 | #endif |
43 | DSP_PROC_DB_ITEM(RESAMPLE) /* resampler providing NATIVE_FREQUENCY */ | 43 | 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 @@ | |||
28 | #include "dsp_misc.h" | 28 | #include "dsp_misc.h" |
29 | #include "eq.h" | 29 | #include "eq.h" |
30 | #include "pga.h" | 30 | #include "pga.h" |
31 | #ifdef HAVE_PITCHSCREEN | 31 | #ifdef HAVE_PITCHCONTROL |
32 | #include "tdspeed.h" | 32 | #include "tdspeed.h" |
33 | #endif | 33 | #endif |
34 | #ifdef HAVE_SW_TONE_CONTROLS | 34 | #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 @@ | |||
1 | #ifndef RBCODECCONFIG_H_INCLUDED | 1 | #ifndef RBCODECCONFIG_H_INCLUDED |
2 | #define RBCODECCONFIG_H_INCLUDED | 2 | #define RBCODECCONFIG_H_INCLUDED |
3 | 3 | ||
4 | #define HAVE_PITCHSCREEN | 4 | #define HAVE_PITCHCONTROL |
5 | //#define HAVE_SW_VOLUME_CONTROL | 5 | //#define HAVE_SW_VOLUME_CONTROL |
6 | #define HAVE_SW_TONE_CONTROLS | 6 | #define HAVE_SW_TONE_CONTROLS |
7 | #define HAVE_ALBUMART | 7 | #define HAVE_ALBUMART |