nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Nils Wallménius 2012-05-08 16:34:26 +02:00
parent d26a35d10b
commit d29a11b7a8
98 changed files with 50 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/SOURCES
View File

@ -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

10
apps/bookmark.c
View File

@ -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

2
apps/features.txt
View File

@ -88,7 +88,7 @@ masd
morse_input
#endif
#if defined(HAVE_PITCHSCREEN)
#if defined(HAVE_PITCHCONTROL)
pitchscreen
#endif

6
apps/gui/skin_engine/skin_tokens.c
View File

@ -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();

4
apps/gui/wps.c
View File

@ -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 */

4
apps/menus/sound_menu.c
View File

@ -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

6
apps/onplay.c
View File

@ -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 },

4
apps/plugin.c
View File

@ -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

4
apps/plugin.h
View File

@ -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

2
apps/plugins/mpegplayer/audio_thread.c
View File

@ -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

4
apps/rbcodec_helpers.c
View File

@ -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 */

2
apps/settings.c
View File

@ -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);

4
apps/settings.h
View File

@ -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

4
apps/settings_list.c
View File

@ -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

5
firmware/export/config.h
View File

@ -1118,4 +1118,9 @@ Lyre prototype 1 */
#define HAVE_PCM_FULL_DUPLEX
#endif
#if (CONFIG_CODEC == SWCODEC) || (CONFIG_CODEC == MAS3587F) || \
(CONFIG_CODEC == MAS3539F)
#define HAVE_PITCHCONTROL
#endif
#endif /* __CONFIG_H__ */

2
firmware/export/config/android.h
View File

@ -29,8 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/archosfmrecorder.h
View File

@ -21,8 +21,7 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAVE_BUTTONBAR

3
firmware/export/config/archosondiofm.h
View File

@ -46,9 +46,6 @@
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF

3
firmware/export/config/archosondiosp.h
View File

@ -39,9 +39,6 @@
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* Define this if you have a software controlled poweroff */
#define HAVE_SW_POWEROFF

3
firmware/export/config/archosrecorder.h
View File

@ -21,8 +21,7 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAVE_BUTTONBAR

3
firmware/export/config/archosrecorderv2.h
View File

@ -21,8 +21,7 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you have the button bar */
#define HAVE_BUTTONBAR

2
firmware/export/config/cowond2.h
View File

@ -48,8 +48,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/creativezv.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/gigabeatfx.h
View File

@ -33,9 +33,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/gigabeats.h
View File

@ -37,9 +37,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/gogearhdd1630.h
View File

@ -45,9 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/gogearhdd6330.h
View File

@ -45,9 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/gogearsa9200.h
View File

@ -29,9 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/hifimanhm60x.h
View File

@ -42,9 +42,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/hifimanhm801.h
View File

@ -39,9 +39,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/iaudio7.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you have LCD enable function */
#define HAVE_LCD_ENABLE

3
firmware/export/config/iaudiom3.h
View File

@ -47,9 +47,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/iaudiom5.h
View File

@ -51,9 +51,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/iaudiox5.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipod1g2g.h
View File

@ -46,8 +46,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipod3g.h
View File

@ -46,8 +46,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipod4g.h
View File

@ -48,8 +48,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/ipod6g.h
View File

@ -63,9 +63,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipodcolor.h
View File

@ -45,8 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipodmini1g.h
View File

@ -46,8 +46,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipodmini2g.h
View File

@ -46,8 +46,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipodnano1g.h
View File

@ -45,8 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/ipodnano2g.h
View File

@ -53,9 +53,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/ipodvideo.h
View File

@ -47,8 +47,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/iriverh10.h
View File

@ -44,9 +44,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/iriverh100.h
View File

@ -34,8 +34,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/iriverh10_5gb.h
View File

@ -44,9 +44,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/iriverh120.h
View File

@ -34,8 +34,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/iriverh300.h
View File

@ -34,8 +34,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/logikdax.h
View File

@ -32,8 +32,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/meizum3.h
View File

@ -44,9 +44,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/meizum6sl.h
View File

@ -44,9 +44,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/meizum6sp.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/mini2440.h
View File

@ -106,8 +106,7 @@
#define HAVE_BMP_SCALING
/* define this to enable JPEG decoding */
#define HAVE_JPEG
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
#define HAVE_QUICKSCREEN
/* define this if you have a real-time clock */

3
firmware/export/config/mpiohd200.h
View File

@ -47,9 +47,6 @@
/* define this if you have access to the quickscreen */
/* #define HAVE_QUICKSCREEN */
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/mpiohd300.h
View File

@ -47,9 +47,6 @@
/* define this if you have access to the quickscreen */
/* #define HAVE_QUICKSCREEN */
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/mrobe100.h
View File

@ -18,9 +18,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/mrobe500.h
View File

@ -59,9 +59,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/nokian8xx.h
View File

@ -29,8 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/nokian900.h
View File

@ -29,8 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/ondavx747.h
View File

@ -58,9 +58,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/ondavx767.h
View File

@ -52,9 +52,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/ondavx777.h
View File

@ -52,9 +52,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/pandora.h
View File

@ -29,8 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/rk27generic.h
View File

@ -48,9 +48,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/samsungyh820.h
View File

@ -85,9 +85,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/samsungyh920.h
View File

@ -85,9 +85,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/samsungyh925.h
View File

@ -82,9 +82,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/samsungypr0.h
View File

@ -43,9 +43,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/samsungyps3.h
View File

@ -44,9 +44,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansac100.h
View File

@ -25,9 +25,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansac200.h
View File

@ -45,9 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansac200v2.h
View File

@ -47,9 +47,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansaclip.h
View File

@ -35,9 +35,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansaclipplus.h
View File

@ -39,9 +39,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansaclipv2.h
View File

@ -35,9 +35,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansaclipzip.h
View File

@ -51,9 +51,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansaconnect.h
View File

@ -60,9 +60,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansae200.h
View File

@ -45,9 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansae200v2.h
View File

@ -45,9 +45,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansafuze.h
View File

@ -49,9 +49,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansafuzeplus.h
View File

@ -42,9 +42,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/sansafuzev2.h
View File

@ -46,9 +46,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/sansam200.h
View File

@ -28,8 +28,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/sansam200v4.h
View File

@ -39,8 +39,6 @@
/* define this if you have access to the quickscreen */
//#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
//#define HAVE_TAGCACHE

3
firmware/export/config/sansaview.h
View File

@ -40,9 +40,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

2
firmware/export/config/sdlapp.h
View File

@ -29,8 +29,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/tatungtpj1022.h
View File

@ -33,9 +33,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* LCD dimensions */
#define LCD_WIDTH 220
#define LCD_HEIGHT 176

3
firmware/export/config/vibe500.h
View File

@ -49,9 +49,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/zenvisionm30gb.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

3
firmware/export/config/zenvisionm60gb.h
View File

@ -50,9 +50,6 @@
/* define this if you have access to the quickscreen */
#define HAVE_QUICKSCREEN
/* define this if you have access to the pitchscreen */
#define HAVE_PITCHSCREEN
/* define this if you would like tagcache to build on this target */
#define HAVE_TAGCACHE

4
firmware/export/sound.h
View File

@ -138,11 +138,11 @@ void sound_set_pitch(int32_t pitch);
int32_t sound_get_pitch(void);
#endif
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
/* precision of the pitch and speed variables */
/* One zero per decimal (100 means two decimal places */
#define PITCH_SPEED_PRECISION 100L
#define PITCH_SPEED_100 (100L * PITCH_SPEED_PRECISION) /* 100% speed */
#endif /* HAVE_PITCHSCREEN */
#endif /* HAVE_PITCHCONTROL */
#endif

2
lib/rbcodec/SOURCES
View File

@ -14,7 +14,7 @@ dsp/dsp_sample_output.c
dsp/eq.c
dsp/lin_resample.c
dsp/pga.c
# ifdef HAVE_PITCHSCREEN
# ifdef HAVE_PITCHCONTROL
dsp/tdspeed.c
# endif
# ifdef HAVE_SW_TONE_CONTROLS

8
lib/rbcodec/dsp/dsp_misc.c
View File

@ -158,7 +158,7 @@ void dsp_replaygain_set_settings(const struct replaygain_settings *settings)
/** Pitch Settings **/
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
static int32_t pitch_ratio = PITCH_SPEED_100;
static void dsp_pitch_update(struct dsp_config *dsp)
@ -183,7 +183,7 @@ void sound_set_pitch(int32_t percent)
struct sample_io_data *data = (void *)dsp;
dsp_configure(dsp, DSP_SWITCH_FREQUENCY, data->format.codec_frequency);
}
#endif /* HAVE_PITCHSCREEN */
#endif /* HAVE_PITCHCONTROL */
/* This is a null-processing stage that monitors as an enabled stage but never
* becomes active in processing samples. It only hooks messages. */
@ -208,7 +208,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
break;
case DSP_RESET:
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
dsp_pitch_update(dsp);
#endif
value = (intptr_t)NULL; /* Default gains */
@ -216,7 +216,7 @@ static intptr_t misc_handler_configure(struct dsp_proc_entry *this,
dsp_replaygain_set_gains((void *)value);
break;
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
case DSP_SET_FREQUENCY:
dsp_pitch_update(dsp);
break;

4
lib/rbcodec/dsp/dsp_misc.h
View File

@ -54,10 +54,10 @@ struct dsp_replay_gains
void dsp_replaygain_set_settings(const struct replaygain_settings *settings);
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
void sound_set_pitch(int32_t ratio);
int32_t sound_get_pitch(void);
#endif /* HAVE_PITCHSCREEN */
#endif /* HAVE_PITCHCONTROL */
/* Callback for firmware layers to interface */
int dsp_callback(int msg, intptr_t param);

2
lib/rbcodec/dsp/dsp_proc_database.h
View File

@ -37,7 +37,7 @@
DSP_PROC_DB_START
DSP_PROC_DB_ITEM(MISC_HANDLER) /* misc stuff (null stage) */
DSP_PROC_DB_ITEM(PGA) /* pre-gain amp */
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
DSP_PROC_DB_ITEM(TIMESTRETCH) /* time-stretching */
#endif
DSP_PROC_DB_ITEM(RESAMPLE) /* resampler providing NATIVE_FREQUENCY */

2
lib/rbcodec/dsp/dsp_proc_settings.h
View File

@ -28,7 +28,7 @@
#include "dsp_misc.h"
#include "eq.h"
#include "pga.h"
#ifdef HAVE_PITCHSCREEN
#ifdef HAVE_PITCHCONTROL
#include "tdspeed.h"
#endif
#ifdef HAVE_SW_TONE_CONTROLS

2
lib/rbcodec/rbcodecconfig-example.h
View File

@ -1,7 +1,7 @@
#ifndef RBCODECCONFIG_H_INCLUDED
#define RBCODECCONFIG_H_INCLUDED
#define HAVE_PITCHSCREEN
#define HAVE_PITCHCONTROL
//#define HAVE_SW_VOLUME_CONTROL
#define HAVE_SW_TONE_CONTROLS
#define HAVE_ALBUMART