diff options
author | Nils Wallménius <nils@rockbox.org> | 2012-05-08 16:34:26 +0200 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2012-05-09 14:32:38 +0200 |
commit | d29a11b7a8f4ce230e9385a44f352a559bde753f (patch) | |
tree | 6fb4dc1699be894e5495dd862941606442239bfc /apps | |
parent | d26a35d10b9e2f808b0e4880d5b5d1a2963258e9 (diff) | |
download | rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.tar.gz rockbox-d29a11b7a8f4ce230e9385a44f352a559bde753f.zip |
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>
Diffstat (limited to 'apps')
-rw-r--r-- | apps/SOURCES | 2 | ||||
-rw-r--r-- | apps/bookmark.c | 10 | ||||
-rw-r--r-- | apps/features.txt | 2 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 6 | ||||
-rw-r--r-- | apps/gui/wps.c | 4 | ||||
-rw-r--r-- | apps/menus/sound_menu.c | 4 | ||||
-rw-r--r-- | apps/onplay.c | 6 | ||||
-rw-r--r-- | apps/plugin.c | 4 | ||||
-rw-r--r-- | apps/plugin.h | 4 | ||||
-rw-r--r-- | apps/plugins/mpegplayer/audio_thread.c | 2 | ||||
-rw-r--r-- | apps/rbcodec_helpers.c | 4 | ||||
-rw-r--r-- | apps/settings.c | 2 | ||||
-rw-r--r-- | apps/settings.h | 4 | ||||
-rw-r--r-- | apps/settings_list.c | 4 |
14 files changed, 29 insertions, 29 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 |