forked from len0rd/rockbox
skin_tokne.c: move WPS_TOKEN_TRACK_STARTING and WPS_TOKEN_TRACK_ENDING to get_id3_token().
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26193 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
0e263d5b77
commit
7042d9516b
1 changed files with 14 additions and 17 deletions
|
|
@ -254,6 +254,20 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3,
|
||||||
snprintf(buf, buf_size, "%lu", 100 * elapsed / length);
|
snprintf(buf, buf_size, "%lu", 100 * elapsed / length);
|
||||||
return buf;
|
return buf;
|
||||||
|
|
||||||
|
case WPS_TOKEN_TRACK_STARTING:
|
||||||
|
{
|
||||||
|
unsigned long time = token->value.i * 1000;
|
||||||
|
if (elapsed < time)
|
||||||
|
return "starting";
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
case WPS_TOKEN_TRACK_ENDING:
|
||||||
|
{
|
||||||
|
unsigned long time = token->value.i * 1000;
|
||||||
|
if (length - elapsed < time)
|
||||||
|
return "ending";
|
||||||
|
}
|
||||||
|
return NULL;
|
||||||
|
|
||||||
case WPS_TOKEN_FILE_CODEC:
|
case WPS_TOKEN_FILE_CODEC:
|
||||||
if (intval)
|
if (intval)
|
||||||
|
|
@ -1018,23 +1032,6 @@ const char *get_token_value(struct gui_wps *gwps,
|
||||||
return "v";
|
return "v";
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
case WPS_TOKEN_TRACK_STARTING:
|
|
||||||
if (id3)
|
|
||||||
{
|
|
||||||
int elapsed = id3->elapsed + state->ff_rewind_count;
|
|
||||||
if (elapsed < token->value.i * 1000)
|
|
||||||
return "starting";
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
case WPS_TOKEN_TRACK_ENDING:
|
|
||||||
if (id3)
|
|
||||||
{
|
|
||||||
unsigned long elapsed = id3->elapsed + state->ff_rewind_count;
|
|
||||||
unsigned time = token->value.i * 1000;
|
|
||||||
if (id3->length - elapsed < time)
|
|
||||||
return "ending";
|
|
||||||
}
|
|
||||||
return NULL;
|
|
||||||
case WPS_TOKEN_LASTTOUCH:
|
case WPS_TOKEN_LASTTOUCH:
|
||||||
#ifdef HAVE_TOUCHSCREEN
|
#ifdef HAVE_TOUCHSCREEN
|
||||||
if (TIME_BEFORE(current_tick, token->value.i * TIMEOUT_UNIT +
|
if (TIME_BEFORE(current_tick, token->value.i * TIMEOUT_UNIT +
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue