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

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[] = {
 #ifdef HAVE_ALBUMART
     { WPS_NO_TOKEN,                       "Cl",  0,    parse_albumart_load },
     { WPS_TOKEN_ALBUMART_DISPLAY,         "Cd",   WPS_REFRESH_STATIC,  parse_albumart_display },
+    { WPS_TOKEN_ALBUMART_FOUND,           "C", WPS_REFRESH_STATIC, NULL },
 #endif
 
     { WPS_VIEWPORT_ENABLE,                "Vd",  WPS_REFRESH_DYNAMIC,
@@ -1482,11 +1483,7 @@ static int parse_albumart_display(const char *wps_bufptr,
 {
     (void)wps_bufptr;
     struct wps_token *prev = token-1;
-    if ((wps_data->num_tokens >= 1) && (prev->type == WPS_TOKEN_CONDITIONAL))
-    {
-        token->type = WPS_TOKEN_ALBUMART_FOUND;
-    }
-    else if (wps_data->albumart)
+    if (wps_data->albumart)
     {
         wps_data->albumart->vp = &curr_vp->vp;
     }