From fe11eb29496a69a566349ac3d6c3313db4443564 Mon Sep 17 00:00:00 2001 From: jdgordon Date: Thu, 18 Mar 2010 07:20:14 +0000 Subject: [PATCH] fix yelllow and add those tags to the debug output git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25240 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_tokens.c | 5 +++-- apps/gui/skin_engine/wps_debug.c | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index df2c42e727..8cf48fb202 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -908,8 +908,9 @@ const char *get_token_value(struct gui_wps *gwps, case WPS_TOKEN_TRACK_ENDING: if (id3) { - int elapsed = id3->elapsed + + state->ff_rewind_count; - if (id3->length - elapsed < token->value.i * HZ) + unsigned long elapsed = id3->elapsed + + state->ff_rewind_count; + unsigned time = token->value.i * HZ; + if (id3->length - elapsed < time) return "ending"; } return NULL; diff --git a/apps/gui/skin_engine/wps_debug.c b/apps/gui/skin_engine/wps_debug.c index 9a6d4e09cf..26554b1db6 100644 --- a/apps/gui/skin_engine/wps_debug.c +++ b/apps/gui/skin_engine/wps_debug.c @@ -504,6 +504,13 @@ static char *get_token_desc(struct wps_token *token, char *buf, case WPS_TOKEN_LANG_IS_RTL: snprintf(buf, bufsize, "lang: is_rtl?"); break; + + case WPS_TOKEN_TRACK_STARTING: + snprintf(buf, bufsize, "first %d seconds of track", token->value.i); + break; + case WPS_TOKEN_TRACK_ENDING: + snprintf(buf, bufsize, "last %d seconds of track", token->value.i); + break; default: for(i=1; i