len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 10:07:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[Feature] Skin engine Themes grab text from a file %ft(file, line) WIP"

Browse source 
This reverts commit 62b5dfd81d.

This was accidentally merged, and wasn't up-to-date anyway.

Change-Id: I4fcceb8dc4f86762701daab72498202cabd8295a
This commit is contained in:
Solomon Peachy 2024-12-07 13:47:49 -05:00
parent 3b78daed14
commit e6851a55ed
32 changed files with 50 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1316,73 +1316,6 @@ static int parse_progressbar_tag(struct skin_element* element,
return 0;
}
static int parse_filetext(struct skin_element *element,
struct wps_token *token,
struct wps_data *wps_data)
{
(void)wps_data;
const char* filename;
char buf[MAX_PATH];
int line = 0;
int fd;
/* format: %ft(filename[,line]) */
filename = get_param_text(element, 0);
if (element->params_count == 2)
line = get_param(element, 1)->data.number;
else if (element->params_count != 1)
{
DEBUGF("%s(file, line): %s Error: param count %d\n",
__func__, filename, element->params_count);
return WPS_ERROR_INVALID_PARAM;
}
path_append(buf, root_realpath(), filename, sizeof(buf));
DEBUGF("%s %s[%d]\n", __func__, buf, line);
if ((fd = open_utf8(buf, O_RDONLY)) < 0)
{
DEBUGF("%s: Error Opening %s\n", __func__, buf);
goto failure;
}
int rd = 0;
while (line >= 0)
{
if ((rd = read_line(fd, buf, sizeof(buf))) < 0)
{
buf[0] = '\0';
break;
}
line--;
}
if (rd <= 0) /* empty line? */
{
DEBUGF("%s: Error(%d) Reading %s\n", __func__, rd, filename);
goto failure;
}
buf[rd] = '\0';
char * skinbuf = skin_buffer_alloc(rd+1);
if (!skinbuf)
{
DEBUGF("%s: Error No Buffer %s\n", __func__, filename);
close(fd);
return WPS_ERROR_INVALID_PARAM;
}
strcpy(skinbuf, buf);
close(fd);
token->value.data = PTRTOSKINOFFSET(skin_buffer, skinbuf);
token->type = SKIN_TOKEN_STRING;
return 0;
failure:
element->type = COMMENT;
token->type = SKIN_TOKEN_NO_TOKEN;
return 0;
}
#ifdef HAVE_ALBUMART
static int parse_albumart_load(struct skin_element* element,
struct wps_token *token,
@ -2445,9 +2378,6 @@ static int skin_element_callback(struct skin_element* element, void* data)
case SKIN_TOKEN_FILE_DIRECTORY:
token->value.i = get_param(element, 0)->data.number;
break;
case SKIN_TOKEN_FILE_TEXT:
function = parse_filetext;
break;
#ifdef HAVE_BACKDROP_IMAGE
case SKIN_TOKEN_VIEWPORT_FGCOLOUR:
case SKIN_TOKEN_VIEWPORT_BGCOLOUR:

23
apps/gui/skin_engine/skin_render.c
View file

@ -633,23 +633,20 @@ static int get_subline_timeout(struct gui_wps *gwps, struct skin_element* line)
{
token = SKINOFFSETTOPTR(skin_buffer, element->data);
if (token)
retval = token->value.i;
return token->value.i;
}
else if (element->type == CONDITIONAL)
{
struct conditional *conditional = SKINOFFSETTOPTR(skin_buffer, element->data);
int val = evaluate_conditional(gwps, 0, conditional, element->children_count);
int tmoval = get_subline_timeout(gwps, get_child(element->children, val));
if (tmoval >= 0)
int val = evaluate_conditional(gwps, 0, conditional,
element->children_count);
if (val >= 0)
{
return MAX(retval, tmoval); /* Bugfix %t()%?CONDITIONAL tmo ignored */
retval = get_subline_timeout(gwps, get_child(element->children, val));
if (retval >= 0)
return retval;
}
}
else if (element->type == COMMENT)
{
retval = 0; /* don't display this item */
}
element = SKINOFFSETTOPTR(skin_buffer, element->next);
}
return retval;
@ -660,7 +657,6 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info
bool changed_lines = false;
struct line_alternator *alternator = SKINOFFSETTOPTR(skin_buffer, element->data);
unsigned old_refresh = info->refresh_type;
if (info->refresh_type == SKIN_REFRESH_ALL)
{
alternator->current_line = element->children_count-1;
@ -701,10 +697,7 @@ bool skin_render_alternator(struct skin_element* element, struct skin_draw_info
if (suitable)
{
alternator->current_line = try_line;
if (TIME_AFTER(current_tick, alternator->next_change_tick))
{
alternator->next_change_tick = current_tick + rettimeout;
}
alternator->next_change_tick = current_tick + rettimeout;
}
info->refresh_type = SKIN_REFRESH_ALL;

14
apps/main.c
View file

@ -199,20 +199,6 @@ int main(void)
}
#endif
#if !defined(BOOTLOADER)
char buf[MAX_PATH / 2];
path_append(buf, root_realpath(),ROCKBOX_DIR"/playername.txt", sizeof(buf));
if (!file_exists(buf))
{
int fd = open(buf, O_CREAT|O_WRONLY|O_TRUNC, 0666);
if(fd >= 0)
{
fdprintf(fd, "RockBox!");
close(fd);
}
}
#endif
#ifdef AUTOROCK
{
char filename[MAX_PATH];

1
lib/skin_parser/tag_table.c
View file

@ -50,7 +50,6 @@ static const struct tag_info legal_tags[] =
TAG(SKIN_TOKEN_FILE_SIZE, "fs", "", SKIN_REFRESH_STATIC),
TAG(SKIN_TOKEN_FILE_VBR, "fv", "", SKIN_REFRESH_STATIC),
TAG(SKIN_TOKEN_FILE_DIRECTORY, "d" , "I", SKIN_REFRESH_STATIC),
TAG(SKIN_TOKEN_FILE_TEXT, "ft" , "F|i", SKIN_REFRESH_STATIC),
TAG(SKIN_TOKEN_FILE_BITRATE, "Fb", "", SKIN_REFRESH_STATIC),
TAG(SKIN_TOKEN_FILE_CODEC, "Fc", "", SKIN_REFRESH_STATIC),

1
lib/skin_parser/tag_table.h
View file

@ -155,7 +155,6 @@ enum skin_token_type {
SKIN_TOKEN_FILE_SIZE,
SKIN_TOKEN_FILE_VBR,
SKIN_TOKEN_FILE_DIRECTORY,
SKIN_TOKEN_FILE_TEXT,
/* Image */
SKIN_TOKEN_IMAGE_BACKDROP,

1
utils/skinupdater/tag_table.c
View file

@ -70,7 +70,6 @@ struct tag_info legal_tags[] =
{ "fn", "" },
{ "fp", "" },
{ "fs", "" },
{ "ft", "" },
{ "fv", "" },
{ "d" , "I" },

2
wps/cabbiev2.112x64x1.wps
View file

@ -50,6 +50,6 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%t(5)%ac%s%?Fn<%Sx(Next:) %?It<%It|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>%;%t(5)%ac%s%?Fn<%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%Fn>|%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>>>
%V(0,48,-,8,-)
%pc%ar%pr

2
wps/cabbiev2.128x128x16.wps
View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,73,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,95,122,12,1)

2
wps/cabbiev2.128x128x2.wps
View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,70,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,96,122,12,-)

2
wps/cabbiev2.128x160x16.wps
View file

@ -55,7 +55,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%s%acNext Track:
%s%ac%?It<%It|%Fn>
#Time and Playlist Info

2
wps/cabbiev2.128x64x1.wps
View file

@ -59,4 +59,4 @@
#
# Next Track Info
%V(0,42,128,8,1)
%ac%t(300)%s%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%ac%s%Sx(Next:) %?It<%It|%Fn>

2
wps/cabbiev2.128x96x16.wps
View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(3,56,122,12,-)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(3,73,122,12,1)

2
wps/cabbiev2.128x96x2.wps
View file

@ -53,4 +53,4 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%Sx(Next:) %ac%It;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%Sx(Next:) %ac%It

4
wps/cabbiev2.132x80x16.wps
View file

@ -57,11 +57,11 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next:) %?It<%It|%Fn>;%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next:) %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,10,-,48,1)
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>

4
wps/cabbiev2.138x110x2.wps
View file

@ -61,7 +61,7 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -69,5 +69,5 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next Track:);%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

2
wps/cabbiev2.160x128x1.wps
View file

@ -55,5 +55,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

4
wps/cabbiev2.160x128x16.wps
View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%t(300)%Sx(Next Track:);%t(1)%ft(.rockbox/playername.txt)
%Sx(Next Track:)
%s%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

4
wps/cabbiev2.160x128x2.wps
View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

4
wps/cabbiev2.176x132x16.wps
View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

2
wps/cabbiev2.176x220x16.wps
View file

@ -69,6 +69,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy|>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

4
wps/cabbiev2.220x176x16.wps
View file

@ -62,7 +62,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
#
# Track Info - No Album Art
@ -71,5 +71,5 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>

4
wps/cabbiev2.240x320x16.mini2440.wps
View file

@ -28,9 +28,9 @@
%?C<|>
%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
%?C<%s%ac%?it<%it|%fn>|>
%t(300)%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>|%ac%Sx(Next Track:)>>
%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr

4
wps/cabbiev2.240x320x16.wps
View file

@ -61,7 +61,7 @@
%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,45,-,198,1)
@ -73,7 +73,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%ac%t(300)%Sx(Next:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next:)
%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
%ac%s%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>

4
wps/cabbiev2.240x400x16.wps
View file

@ -23,9 +23,9 @@
%?C<|>
%?C<%s%ac%?id<%id|%?d(1)<%d(1)|%(root%)>>|%ac%s%?It<%It|%Fn>>
%?C<%s%ac%?it<%it|%fn>|>
%t(300)%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>|%ac%Sx(Next Track:)>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>|%ac%Sx(Next Track:)>
%?C<|%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>>
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
%pc%ac%?Sr<%pe %Sx(of) %pp|%pp %Sx(of) %pe>%ar%pr

4
wps/cabbiev2.320x240x16.mrobe500.wps
View file

@ -35,7 +35,7 @@
%s%al%?id<%id|%?d(1)<%d(1)|%(root%)>>
#%s%al%iy
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%IA>
@ -45,7 +45,7 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%iy
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%IA>

4
wps/cabbiev2.320x240x16.wps
View file

@ -63,7 +63,7 @@
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%al%?iy<%iy>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%?IA<%IA>>
#
@ -74,6 +74,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

4
wps/cabbiev2.320x480x16.wps
View file

@ -35,7 +35,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%ac%s%?It<%It|%Fn>
#
# album art viewport
@ -53,7 +53,7 @@
# next track info - AA
%Vl(d,0,338,-,-120,-)
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
# playtime
%V(15,398,290,30,-)

4
wps/cabbiev2.360x400x16.wps
View file

@ -62,7 +62,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
# Track Info - No Album Art
%Vl(b,0,56,-,247,1)
@ -75,7 +75,7 @@
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%ac%t(300)%Sx(Next:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next:)
%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>
%ac%s%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>

4
wps/cabbiev2.400x240x16.wps
View file

@ -63,7 +63,7 @@
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%al%?iy<%iy>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?It<%It|%Fn>
%s%al%?Ia<%Ia|%?IA<%IA>>
#
@ -74,6 +74,6 @@
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%ac%?iy<%iy>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?It<%It|%Fn>
%s%ac%?Ia<%Ia|%?IA<%IA>>

4
wps/cabbiev2.480x800x16.wps
View file

@ -36,7 +36,7 @@
%ac%?ig<%ig|>
%ac%?fv<%(vbr%) |>%fb kbit/s %fc
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%ac%s%?It<%It|%Fn>
#
# album art viewport
@ -54,7 +54,7 @@
# next track info - AA
%Vl(d,0,550,-,-200,-)
%t(300)%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%?C<%s%ac%Sx(Next:) %?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>|%s%ac%?Id<%Id|%?D(1)<%D(1)|%(root%)>>>
# playtime
%V(20,660,440,36,-)

4
wps/cabbiev2.800x480x16.wps
View file

@ -21,7 +21,7 @@
%s%ac%?it<%it|%fn>
%s%ac%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%ac%t(300)%Sx(Next Track:);%ac%t(1)%ft(.rockbox/playername.txt)
%ac%Sx(Next Track:)
%s%ac%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
#
@ -38,7 +38,7 @@
%s%al%?it<%it|%fn>
%s%al%?ia<%ia|%?iA<%iA|%?d(2)<%d(2)|%(root%)>>>
%s%t(300)%al%Sx(Next Track:);%s%al%t(1)%ft(.rockbox/playername.txt)
%s%al%Sx(Next Track:)
%s%al%?Ia<%Ia|%?IA<%IA|%?D(2)<%D(2)|%(root%)>>> - %?It<%It|%Fn>
# playtime

2
wps/cabbiev2.96x96x16.wps
View file

@ -49,7 +49,7 @@
#
# Next Track Info
%V(2,56,92,8,1)
%s%t(300)%ac%Sx(Next:) %?It<%It|%Fn>;%s%ac%t(1)%ft(.rockbox/playername.txt)
%s%ac%Sx(Next:) %?It<%It|%Fn>
#
# Time Elapsed/Remaining
%V(2,73,92,8,1)