diff options
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 4 | ||||
-rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index ed7771529e..5048b27f8e 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -495,9 +495,7 @@ static int parse_timeout_tag(struct skin_element *element, | |||
495 | } | 495 | } |
496 | else | 496 | else |
497 | val = element->params[0].data.number; | 497 | val = element->params[0].data.number; |
498 | token->value.i = val; | 498 | token->value.i = val * TIMEOUT_UNIT; |
499 | if (token->type == SKIN_TOKEN_SUBLINE_TIMEOUT) | ||
500 | curr_line->timeout = val * TIMEOUT_UNIT; | ||
501 | return 0; | 499 | return 0; |
502 | } | 500 | } |
503 | 501 | ||
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index a05327907d..1d617fdfa6 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c | |||
@@ -293,14 +293,14 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, | |||
293 | 293 | ||
294 | case SKIN_TOKEN_TRACK_STARTING: | 294 | case SKIN_TOKEN_TRACK_STARTING: |
295 | { | 295 | { |
296 | unsigned long time = token->value.i * 1000; | 296 | unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT); |
297 | if (elapsed < time) | 297 | if (elapsed < time) |
298 | return "starting"; | 298 | return "starting"; |
299 | } | 299 | } |
300 | return NULL; | 300 | return NULL; |
301 | case SKIN_TOKEN_TRACK_ENDING: | 301 | case SKIN_TOKEN_TRACK_ENDING: |
302 | { | 302 | { |
303 | unsigned long time = token->value.i * 1000; | 303 | unsigned long time = token->value.i * (HZ/TIMEOUT_UNIT); |
304 | if (length - elapsed < time) | 304 | if (length - elapsed < time) |
305 | return "ending"; | 305 | return "ending"; |
306 | } | 306 | } |
@@ -1066,7 +1066,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1066 | case SKIN_TOKEN_BUTTON_VOLUME: | 1066 | case SKIN_TOKEN_BUTTON_VOLUME: |
1067 | if (global_status.last_volume_change && | 1067 | if (global_status.last_volume_change && |
1068 | TIME_BEFORE(current_tick, global_status.last_volume_change + | 1068 | TIME_BEFORE(current_tick, global_status.last_volume_change + |
1069 | token->value.i * TIMEOUT_UNIT)) | 1069 | token->value.i)) |
1070 | return "v"; | 1070 | return "v"; |
1071 | return NULL; | 1071 | return NULL; |
1072 | 1072 | ||
@@ -1075,8 +1075,7 @@ const char *get_token_value(struct gui_wps *gwps, | |||
1075 | #ifdef HAVE_TOUCHSCREEN | 1075 | #ifdef HAVE_TOUCHSCREEN |
1076 | unsigned int last_touch = touchscreen_last_touch(); | 1076 | unsigned int last_touch = touchscreen_last_touch(); |
1077 | if (last_touch != 0xffff && | 1077 | if (last_touch != 0xffff && |
1078 | TIME_BEFORE(current_tick, token->value.i * TIMEOUT_UNIT + | 1078 | TIME_BEFORE(current_tick, token->value.i) + last_touch)) |
1079 | last_touch)) | ||
1080 | return "t"; | 1079 | return "t"; |
1081 | #endif | 1080 | #endif |
1082 | } | 1081 | } |