Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

The real reason to change the %C was to remove a very nasty hack!

Browse source 
%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
This commit is contained in:
Jonathan Gordon 2010-06-08 15:09:32 +00:00
parent 360ed994a3
commit 50356d8387
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/skin_engine/skin_parser.c
View file

@ -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;
}

3
manual/appendix/wps_tags.tex
View file

@ -389,7 +389,8 @@ follows.
& \config{y}: y coordinate\\
& \config{maxwidth}: Maximum height\\
& \config{maxheight}: Maximum width\\
\config{\%Cd} & Display the album art as configured. This tag can also be used as a conditional.\\
\config{\%Cd} & Display the album art as configured. \\
\config{\%C} & USe in a conditional to determine if an image is available. \\
\end{tagmap}
The picture will be rescaled, preserving aspect ratio to fit the given

21
utils/skinupdater/skinupdater.c
View file

@ -116,6 +116,12 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
fprintf(out, "%s", tag->name);
return strlen(tag->name);
}
if (!strcmp(tag->name, "C"))
{
fprintf(out, "Cd");
return 1;
}
fprintf(out, "%s", tag->name);
len += strlen(tag->name);
start += len;
@ -190,10 +196,6 @@ int parse_tag(FILE* out, const char* start, bool in_conditional)
PUTCH(out, '(');
len += 1+dump_arg(out, start+1, 2, true);
}
else if (MATCH("C"))
{
fprintf(out, "%%Cd");
}
else if (MATCH("Cl"))
{
int read;
@ -365,7 +367,16 @@ top:
goto top;
break;
case '?':
PUTCH(out, *in++);
if (in[1] == 'C' && in[2] == '<')
{
fprintf(out, "?C");
in += 2;
goto top;
}
else
{
PUTCH(out, *in++);
}
break;
}
len = parse_tag(out, in, level>0);

2
utils/skinupdater/tag_table.c
View file

@ -173,7 +173,7 @@ struct tag_info legal_tags[] =
{ "Fl" , "IF"},
{ "Cl" , "IISS"},
{ "C" , ""},
{ "C" , "important"},
{ "Vd" , "S"},
{ "VI" , "S"},