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

FS#11507 - fix 'track starting/ending' tags, and minor timeout cleanup

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27649 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonathan Gordon 2010-08-01 10:40:29 +00:00
parent 38caf2c807
commit 6dc4d65aa1
2 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/gui/skin_engine/skin_parser.c
View file

@ -495,9 +495,7 @@ static int parse_timeout_tag(struct skin_element *element,
} }
else else
val = element->params[0].data.number; val = element->params[0].data.number;
token->value.i = val; token->value.i = val * TIMEOUT_UNIT;
if (token->type == SKIN_TOKEN_SUBLINE_TIMEOUT)
curr_line->timeout = val * TIMEOUT_UNIT;
return 0; return 0;
} }

9
apps/gui/skin_engine/skin_tokens.c
View file

@ -293,14 +293,14 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
case SKIN_TOKEN_TRACK_STARTING: case SKIN_TOKEN_TRACK_STARTING:
{ {
unsigned long time = token->value.i * 1000; unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT);
if (elapsed < time) if (elapsed < time)
return "starting"; return "starting";
} }
return NULL; return NULL;
case SKIN_TOKEN_TRACK_ENDING: case SKIN_TOKEN_TRACK_ENDING:
{ {
unsigned long time = token->value.i * 1000; unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT);
if (length - elapsed < time) if (length - elapsed < time)
return "ending"; return "ending";
} }
@ -1066,7 +1066,7 @@ const char *get_token_value(struct gui_wps *gwps,
case SKIN_TOKEN_BUTTON_VOLUME: case SKIN_TOKEN_BUTTON_VOLUME:
if (global_status.last_volume_change && if (global_status.last_volume_change &&
TIME_BEFORE(current_tick, global_status.last_volume_change + TIME_BEFORE(current_tick, global_status.last_volume_change +
token->value.i * TIMEOUT_UNIT)) token->value.i))
return "v"; return "v";
return NULL; return NULL;
@ -1075,8 +1075,7 @@ const char *get_token_value(struct gui_wps *gwps,
#ifdef HAVE_TOUCHSCREEN #ifdef HAVE_TOUCHSCREEN
unsigned int last_touch = touchscreen_last_touch(); unsigned int last_touch = touchscreen_last_touch();
if (last_touch != 0xffff && if (last_touch != 0xffff &&
TIME_BEFORE(current_tick, token->value.i * TIMEOUT_UNIT + TIME_BEFORE(current_tick, token->value.i) + last_touch))
last_touch))
return "t"; return "t";
#endif #endif
} }