diff options
author | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-08 15:09:32 +0000 |
---|---|---|
committer | Jonathan Gordon <rockbox@jdgordon.info> | 2010-06-08 15:09:32 +0000 |
commit | 50356d8387383a62bad97b2d3ea5b5af8d06805a (patch) | |
tree | 44313ad4268bdd517306ccf2df039318e2863992 /apps/gui/skin_engine | |
parent | 360ed994a3788d9cbdf95554cc6144bea22b2166 (diff) | |
download | rockbox-50356d8387383a62bad97b2d3ea5b5af8d06805a.tar.gz rockbox-50356d8387383a62bad97b2d3ea5b5af8d06805a.zip |
The real reason to change the %C was to remove a very nasty hack!
%CL - load the AA
%C - check if AA is avilable
%Cd - display the AA
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26696 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/skin_engine')
-rw-r--r-- | apps/gui/skin_engine/skin_parser.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index f5d49f9e22..293358bb0a 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c | |||
@@ -391,6 +391,7 @@ static const struct wps_tag all_tags[] = { | |||
391 | #ifdef HAVE_ALBUMART | 391 | #ifdef HAVE_ALBUMART |
392 | { WPS_NO_TOKEN, "Cl", 0, parse_albumart_load }, | 392 | { WPS_NO_TOKEN, "Cl", 0, parse_albumart_load }, |
393 | { WPS_TOKEN_ALBUMART_DISPLAY, "Cd", WPS_REFRESH_STATIC, parse_albumart_display }, | 393 | { WPS_TOKEN_ALBUMART_DISPLAY, "Cd", WPS_REFRESH_STATIC, parse_albumart_display }, |
394 | { WPS_TOKEN_ALBUMART_FOUND, "C", WPS_REFRESH_STATIC, NULL }, | ||
394 | #endif | 395 | #endif |
395 | 396 | ||
396 | { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, | 397 | { WPS_VIEWPORT_ENABLE, "Vd", WPS_REFRESH_DYNAMIC, |
@@ -1482,11 +1483,7 @@ static int parse_albumart_display(const char *wps_bufptr, | |||
1482 | { | 1483 | { |
1483 | (void)wps_bufptr; | 1484 | (void)wps_bufptr; |
1484 | struct wps_token *prev = token-1; | 1485 | struct wps_token *prev = token-1; |
1485 | if ((wps_data->num_tokens >= 1) && (prev->type == WPS_TOKEN_CONDITIONAL)) | 1486 | if (wps_data->albumart) |
1486 | { | ||
1487 | token->type = WPS_TOKEN_ALBUMART_FOUND; | ||
1488 | } | ||
1489 | else if (wps_data->albumart) | ||
1490 | { | 1487 | { |
1491 | wps_data->albumart->vp = &curr_vp->vp; | 1488 | wps_data->albumart->vp = &curr_vp->vp; |
1492 | } | 1489 | } |