devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

* Make some private variables 'static'.

Browse source 
* Fix the pitch tag and allow it to be used on all targets except the Archos Player.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13020 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nicolas Pennequin 2007-04-04 15:47:51 +00:00
parent ab90d58801
commit 830a3a4720
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
apps/gui/gwps-common.c
View file

@ -1284,12 +1284,16 @@ static char *get_tag(struct gui_wps *gwps,
} }
return buf; return buf;
} }
#endif
#if (CONFIG_CODEC != MAS3507D)
case WPS_TOKEN_SOUND_PITCH: case WPS_TOKEN_SOUND_PITCH:
{
int val = sound_get_pitch();
snprintf(buf, buf_size, "%d.%d", snprintf(buf, buf_size, "%d.%d",
*intval / 10, *intval % 10); val / 10, val % 10);
return buf; return buf;
}
#endif #endif
#ifdef HAS_BUTTON_HOLD #ifdef HAS_BUTTON_HOLD

4
apps/gui/gwps.h
View file

@ -122,9 +122,11 @@ enum wps_token_type {
WPS_TOKEN_BATTERY_CHARGING, WPS_TOKEN_BATTERY_CHARGING,
WPS_TOKEN_BATTERY_SLEEPTIME, WPS_TOKEN_BATTERY_SLEEPTIME,
#if (CONFIG_CODEC == SWCODEC)
/* Sound */ /* Sound */
#if (CONFIG_CODEC != MAS3507D)
WPS_TOKEN_SOUND_PITCH, WPS_TOKEN_SOUND_PITCH,
#endif
#if (CONFIG_CODEC == SWCODEC)
WPS_TOKEN_REPLAYGAIN, WPS_TOKEN_REPLAYGAIN,
#endif #endif

16
apps/gui/wps_parser.c
View file

@ -40,24 +40,24 @@
/* level of current conditional. /* level of current conditional.
-1 means we're not in a conditional. */ -1 means we're not in a conditional. */
int level = -1; static int level = -1;
/* index of the last WPS_TOKEN_CONDITIONAL_OPTION /* index of the last WPS_TOKEN_CONDITIONAL_OPTION
or WPS_TOKEN_CONDITIONAL_START in current level */ or WPS_TOKEN_CONDITIONAL_START in current level */
int lastcond[WPS_MAX_COND_LEVEL]; static int lastcond[WPS_MAX_COND_LEVEL];
/* index of the WPS_TOKEN_CONDITIONAL in current level */ /* index of the WPS_TOKEN_CONDITIONAL in current level */
int condindex[WPS_MAX_COND_LEVEL]; static int condindex[WPS_MAX_COND_LEVEL];
/* number of condtional options in current level */ /* number of condtional options in current level */
int numoptions[WPS_MAX_COND_LEVEL]; static int numoptions[WPS_MAX_COND_LEVEL];
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
/* pointers to the bitmap filenames in the WPS source */ /* pointers to the bitmap filenames in the WPS source */
const char *bmp_names[MAX_IMAGES]; static const char *bmp_names[MAX_IMAGES];
const char *pb_bmp_name; static const char *pb_bmp_name;
#if LCD_DEPTH > 1 #if LCD_DEPTH > 1
const char *backdrop_bmp_name; static const char *backdrop_bmp_name;
#endif #endif
#endif #endif
@ -185,7 +185,7 @@ static const struct wps_tag all_tags[] = {
{ "Iy", WPS_TOKEN_METADATA_YEAR, WPS_REFRESH_DYNAMIC, NULL }, { "Iy", WPS_TOKEN_METADATA_YEAR, WPS_REFRESH_DYNAMIC, NULL },
{ "IC", WPS_TOKEN_METADATA_COMMENT, WPS_REFRESH_DYNAMIC, NULL }, { "IC", WPS_TOKEN_METADATA_COMMENT, WPS_REFRESH_DYNAMIC, NULL },
#if (CONFIG_CODEC == SWCODEC) #if (CONFIG_CODEC != MAS3507D)
{ "Sp", WPS_TOKEN_SOUND_PITCH, WPS_REFRESH_DYNAMIC, NULL }, { "Sp", WPS_TOKEN_SOUND_PITCH, WPS_REFRESH_DYNAMIC, NULL },
#endif #endif