summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2011-11-28 11:16:01 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2011-11-28 11:16:01 +0000
commit8ed7ba1d7bdb813687805b7f2c2927d08fc86ed4 (patch)
tree6c436a772d66b23574d64975e04856a7017b944e
parentd66592bad11b09ede186751a0fa1751feb29c15f (diff)
downloadrockbox-8ed7ba1d7bdb813687805b7f2c2927d08fc86ed4.tar.gz
rockbox-8ed7ba1d7bdb813687805b7f2c2927d08fc86ed4.zip
Fix fs#12005 - have %pc,%pl and %pr return the number of seconds when used with %if() instead of a formatted time string
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31082 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/skin_engine/skin_tokens.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 48d79600d2..169c4a36fd 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -306,14 +306,20 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
306 return "?"; 306 return "?";
307 return buf; 307 return buf;
308 case SKIN_TOKEN_TRACK_TIME_ELAPSED: 308 case SKIN_TOKEN_TRACK_TIME_ELAPSED:
309 if (intval && limit == TOKEN_VALUE_ONLY)
310 *intval = elapsed/1000;
309 format_time(buf, buf_size, elapsed); 311 format_time(buf, buf_size, elapsed);
310 return buf; 312 return buf;
311 313
312 case SKIN_TOKEN_TRACK_TIME_REMAINING: 314 case SKIN_TOKEN_TRACK_TIME_REMAINING:
315 if (intval && limit == TOKEN_VALUE_ONLY)
316 *intval = (length - elapsed)/1000;
313 format_time(buf, buf_size, length - elapsed); 317 format_time(buf, buf_size, length - elapsed);
314 return buf; 318 return buf;
315 319
316 case SKIN_TOKEN_TRACK_LENGTH: 320 case SKIN_TOKEN_TRACK_LENGTH:
321 if (intval && limit == TOKEN_VALUE_ONLY)
322 *intval = length/1000;
317 format_time(buf, buf_size, length); 323 format_time(buf, buf_size, length);
318 return buf; 324 return buf;
319 325