diff options
| author | Teruaki Kawashima <teru@rockbox.org> | 2010-05-20 13:41:22 +0000 |
|---|---|---|
| committer | Teruaki Kawashima <teru@rockbox.org> | 2010-05-20 13:41:22 +0000 |
| commit | 7042d9516b6bb94706d96298297aba3000a5616f (patch) | |
| tree | e43b74a6f585aa1558c250a0a32937621b3e5e4b | |
| parent | 0e263d5b779f19033730fff7ec6f16b0715a976d (diff) | |
| download | rockbox-7042d9516b6bb94706d96298297aba3000a5616f.tar.gz rockbox-7042d9516b6bb94706d96298297aba3000a5616f.zip | |
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
| -rw-r--r-- | apps/gui/skin_engine/skin_tokens.c | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c index a85fa171ef..594614aab1 100644 --- a/apps/gui/skin_engine/skin_tokens.c +++ b/apps/gui/skin_engine/skin_tokens.c @@ -254,6 +254,20 @@ const char *get_id3_token(struct wps_token *token, struct mp3entry *id3, snprintf(buf, buf_size, "%lu", 100 * elapsed / length); 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: if (intval) @@ -1018,23 +1032,6 @@ const char *get_token_value(struct gui_wps *gwps, return "v"; 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: #ifdef HAVE_TOUCHSCREEN if (TIME_BEFORE(current_tick, token->value.i * TIMEOUT_UNIT + |