summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/SOURCES2
-rw-r--r--apps/bookmark.c10
-rw-r--r--apps/features.txt2
-rw-r--r--apps/gui/skin_engine/skin_tokens.c6
-rw-r--r--apps/gui/wps.c4
-rw-r--r--apps/menus/sound_menu.c4
-rw-r--r--apps/onplay.c6
-rw-r--r--apps/plugin.c4
-rw-r--r--apps/plugin.h4
-rw-r--r--apps/plugins/mpegplayer/audio_thread.c2
-rw-r--r--apps/rbcodec_helpers.c4
-rw-r--r--apps/settings.c2
-rw-r--r--apps/settings.h4
-rw-r--r--apps/settings_list.c4
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
gui/charcell/list.c
#endif
gui/option_select.c
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
gui/pitchscreen.c
#endif
#ifdef HAVE_QUICKSCREEN
diff --git a/apps/bookmark.c b/apps/bookmark.c
index a6e454f439..12ec1edd0f 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -374,13 +374,13 @@ static char* create_bookmark()
snprintf(global_bookmark, sizeof(global_bookmark),
/* new optional bookmark token descriptors should be inserted
just before the "%s;%s" in this line... */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
">%d;%d;%ld;%d;%ld;%d;%d;%ld;%ld;%s;%s",
#else
">%d;%d;%ld;%d;%ld;%d;%d;%s;%s",
#endif
/* ... their flags should go here ... */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
BM_PITCH | BM_SPEED,
#else
0,
@@ -392,7 +392,7 @@ static char* create_bookmark()
global_settings.repeat_mode,
global_settings.playlist_shuffle,
/* ...and their values should go here */
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
(long)sound_get_pitch(),
(long)dsp_get_timestretch(),
#endif
@@ -954,7 +954,7 @@ static void say_bookmark(const char* bookmark,
/* ------------------------------------------------------------------------*/
static bool play_bookmark(const char* bookmark)
{
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
/* preset pitch and speed to 100% in case bookmark doesn't have info */
bm.pitch = sound_get_pitch();
bm.speed = dsp_get_timestretch();
@@ -964,7 +964,7 @@ static bool play_bookmark(const char* bookmark)
{
global_settings.repeat_mode = bm.repeat_mode;
global_settings.playlist_shuffle = bm.shuffle;
-#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHSCREEN)
+#if CONFIG_CODEC == SWCODEC && defined(HAVE_PITCHCONTROL)
sound_set_pitch(bm.pitch);
dsp_set_timestretch(bm.speed);
#endif
diff --git a/apps/features.txt b/apps/features.txt
index 35f7bb50e0..a65744fd5a 100644
--- a/apps/features.txt
+++ b/apps/features.txt
@@ -88,7 +88,7 @@ masd
morse_input
#endif
-#if defined(HAVE_PITCHSCREEN)
+#if defined(HAVE_PITCHCONTROL)
pitchscreen
#endif
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 578a729bb3..b550a90073 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -125,7 +125,7 @@ char* get_dir(char* buf, int buf_size, const char* path, int level)
return buf;
}
-#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL)
/* A helper to determine the enum value for pitch/speed.
When there are two choices (i.e. boolean), return 1 if the value is
@@ -1462,7 +1462,7 @@ const char *get_token_value(struct gui_wps *gwps,
}
#endif /* (CONFIG_CODEC == SWCODEC) */
-#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC != MAS3507D) && defined (HAVE_PITCHCONTROL)
case SKIN_TOKEN_SOUND_PITCH:
{
int32_t pitch = sound_get_pitch();
@@ -1477,7 +1477,7 @@ const char *get_token_value(struct gui_wps *gwps,
}
#endif
-#if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHSCREEN)
+#if (CONFIG_CODEC == SWCODEC) && defined (HAVE_PITCHCONTROL)
case SKIN_TOKEN_SOUND_SPEED:
{
int32_t pitch = sound_get_pitch();
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 25c97fe613..1acd00d120 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -1011,7 +1011,7 @@ long gui_wps_show(void)
#endif /* BUTTON_F3 */
/* pitch screen */
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
case ACTION_WPS_PITCHSCREEN:
{
gwps_leave_wps();
@@ -1020,7 +1020,7 @@ long gui_wps_show(void)
restore = true;
}
break;
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
#ifdef AB_REPEAT_ENABLE
/* reset A&B markers */
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c
index 8090257a33..d24a9cd695 100644
--- a/apps/menus/sound_menu.c
+++ b/apps/menus/sound_menu.c
@@ -103,7 +103,7 @@ MENUITEM_SETTING(depth_3d, &global_settings.depth_3d, NULL);
&crossfeed, &crossfeed_direct_gain, &crossfeed_cross_gain,
&crossfeed_hf_attenuation, &crossfeed_hf_cutoff);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
static int timestretch_callback(int action,const struct menu_item_ex *this_item)
{
switch (action)
@@ -185,7 +185,7 @@ MAKE_MENU(sound_settings, ID2P(LANG_SOUND_SETTINGS), NULL, Icon_Audio,
#endif
#if CONFIG_CODEC == SWCODEC
,&crossfeed_menu, &equalizer_menu, &dithering_enabled
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
,&timestretch_enabled
#endif
,&compressor_menu
diff --git a/apps/onplay.c b/apps/onplay.c
index 11fffb9312..9152d87bf5 100644
--- a/apps/onplay.c
+++ b/apps/onplay.c
@@ -1000,7 +1000,7 @@ static int browse_id3_wrapper(void)
/* CONTEXT_WPS items */
MENUITEM_FUNCTION(browse_id3_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_MENU_SHOW_ID3_INFO),
browse_id3_wrapper, NULL, NULL, Icon_NOICON);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
MENUITEM_FUNCTION(pitch_screen_item, 0, ID2P(LANG_PITCH),
gui_syncpitchscreen_run, NULL, NULL, Icon_Audio);
#endif
@@ -1189,7 +1189,7 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
#endif
&browse_id3_item, &list_viewers_item,
&delete_file_item, &view_cue_item,
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
&pitch_screen_item,
#endif
);
@@ -1283,7 +1283,7 @@ static struct hotkey_assignment hotkey_items[] = {
{ HOTKEY_SHOW_TRACK_INFO, LANG_MENU_SHOW_ID3_INFO,
HOTKEY_FUNC(browse_id3, NULL),
ONPLAY_RELOAD_DIR },
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
{ HOTKEY_PITCHSCREEN, LANG_PITCH,
HOTKEY_FUNC(gui_syncpitchscreen_run, NULL),
ONPLAY_RELOAD_DIR },
diff --git a/apps/plugin.c b/apps/plugin.c
index c15731aec5..afb336ebdc 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -568,7 +568,7 @@ static const struct plugin_api rockbox_api = {
dsp_crossfeed_enable,
dsp_eq_enable,
dsp_dither_enable,
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
dsp_set_timestretch,
#endif
dsp_configure,
@@ -614,7 +614,7 @@ static const struct plugin_api rockbox_api = {
mpeg_get_last_header,
#endif
#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \
- (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN)
+ (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL)
sound_set_pitch,
#endif
diff --git a/apps/plugin.h b/apps/plugin.h
index 3f63b9a749..b1d3c16979 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -685,7 +685,7 @@ struct plugin_api {
void (*dsp_crossfeed_enable)(bool enable);
void (*dsp_eq_enable)(bool enable);
void (*dsp_dither_enable)(bool enable);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
void (*dsp_set_timestretch)(int32_t percent);
#endif
intptr_t (*dsp_configure)(struct dsp_config *dsp,
@@ -742,7 +742,7 @@ struct plugin_api {
unsigned long (*mpeg_get_last_header)(void);
#endif
#if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) || \
- (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHSCREEN)
+ (CONFIG_CODEC == SWCODEC)) && defined (HAVE_PITCHCONTROL)
void (*sound_set_pitch)(int32_t pitch);
#endif
diff --git a/apps/plugins/mpegplayer/audio_thread.c b/apps/plugins/mpegplayer/audio_thread.c
index b06727f759..b00bf7a113 100644
--- a/apps/plugins/mpegplayer/audio_thread.c
+++ b/apps/plugins/mpegplayer/audio_thread.c
@@ -481,7 +481,7 @@ static void audio_thread(void)
init_mad();
td.dsp = rb->dsp_get_config(CODEC_IDX_AUDIO);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
rb->sound_set_pitch(PITCH_SPEED_100);
rb->dsp_set_timestretch(PITCH_SPEED_100);
#endif
diff --git a/apps/rbcodec_helpers.c b/apps/rbcodec_helpers.c
index 3de92f89f9..b412bb3aa4 100644
--- a/apps/rbcodec_helpers.c
+++ b/apps/rbcodec_helpers.c
@@ -26,7 +26,7 @@
#include "core_alloc.h"
#include "tdspeed.h"
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
static int handles[4] = { 0, 0, 0, 0 };
static int move_callback(int handle, void *current, void *new)
@@ -100,5 +100,5 @@ void tdspeed_free_buffers(int32_t **buffers, int nbuf)
buffers[i] = NULL;
}
}
-#endif /* HAVE_PITCHSCREEN */
+#endif /* HAVE_PITCHCONTROL */
diff --git a/apps/settings.c b/apps/settings.c
index e885beb302..d777eb1565 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -993,7 +993,7 @@ void settings_apply(bool read_disk)
}
dsp_dither_enable(global_settings.dithering_enabled);
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
dsp_timestretch_enable(global_settings.timestretch_enabled);
#endif
dsp_set_compressor(&global_settings.compressor_settings);
diff --git a/apps/settings.h b/apps/settings.h
index 34cc75b116..55d3344cb2 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -341,7 +341,7 @@ struct user_settings
int keyclick; /* keyclick volume */
int keyclick_repeats; /* keyclick on repeats */
bool dithering_enabled;
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
bool timestretch_enabled;
#endif
#endif /* CONFIG_CODEC == SWCODEC */
@@ -733,7 +733,7 @@ struct user_settings
struct touchscreen_parameter ts_calibration_data;
#endif
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
/* pitch screen settings */
bool pitch_mode_semitone;
#if CONFIG_CODEC == SWCODEC
diff --git a/apps/settings_list.c b/apps/settings_list.c
index c332b47655..c925b3273e 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1474,7 +1474,7 @@ const struct settings_list settings[] = {
OFFON_SETTING(F_SOUNDSETTING, dithering_enabled, LANG_DITHERING, false,
"dithering enabled", dsp_dither_enable),
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
/* timestretch */
OFFON_SETTING(F_SOUNDSETTING, timestretch_enabled, LANG_TIMESTRETCH, false,
"timestretch enabled", dsp_timestretch_enable),
@@ -1848,7 +1848,7 @@ const struct settings_list settings[] = {
#endif
OFFON_SETTING(0, prevent_skip, LANG_PREVENT_SKIPPING, false, "prevent track skip", NULL),
-#ifdef HAVE_PITCHSCREEN
+#ifdef HAVE_PITCHCONTROL
OFFON_SETTING(0, pitch_mode_semitone, LANG_SEMITONE, false,
"Semitone pitch change", NULL),
#if CONFIG_CODEC == SWCODEC
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 09:25:02 +0000