summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2009-09-25 18:36:18 +0000
committerThomas Martitz <kugel@rockbox.org>2009-09-25 18:36:18 +0000
commitd045f59989137afc5e9138277bcb24dcfc4c5f3f (patch)
tree2e3313a15bdf24658f527478dd0511de1cf90368 /apps
parentbcd890d7bbac710dcdb1d29e2805989e27f55484 (diff)
downloadrockbox-d045f59989137afc5e9138277bcb24dcfc4c5f3f.tar.gz
rockbox-d045f59989137afc5e9138277bcb24dcfc4c5f3f.tar.bz2
rockbox-d045f59989137afc5e9138277bcb24dcfc4c5f3f.zip
Redo 22825 but this time with caring about alignment.
Change coordinate members in struct skin_albumart to ints. That alone gives a tiny binsize decrease. Change the struct layout (some reordering) to enable more efficient alignment which reclaims 4 of the 8 bytes. Since there's usually only 1 aa struct this should be a net gain. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22835 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/gui/skin_engine/skin_parser.c13
-rw-r--r--apps/gui/skin_engine/wps_internals.h14
2 files changed, 9 insertions, 18 deletions
diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c
index ede1871414..b03bdb013d 100644
--- a/apps/gui/skin_engine/skin_parser.c
+++ b/apps/gui/skin_engine/skin_parser.c
@@ -983,18 +983,9 @@ static int parse_albumart_load(const char *wps_bufptr,
return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl7 */
_pos = wps_bufptr + 1;
- if (!isdigit(*_pos))
- return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl|@ */
- aa->albumart_x = atoi(_pos);
+ _pos = parse_list("dd", NULL, '|', _pos, &aa->albumart_x, &aa->albumart_y);
- _pos = strchr(_pos, '|');
- if (!_pos || _pos > newline || !isdigit(*(++_pos)))
- return WPS_ERROR_INVALID_PARAM; /* malformed token: e.g. %Cl|7\n or %Cl|7|@ */
-
- aa->albumart_y = atoi(_pos);
-
- _pos = strchr(_pos, '|');
- if (!_pos || _pos > newline)
+ if (!_pos || _pos > newline || *_pos != '|')
return WPS_ERROR_INVALID_PARAM; /* malformed token: no | after y coordinate
e.g. %Cl|7|59\n */
diff --git a/apps/gui/skin_engine/wps_internals.h b/apps/gui/skin_engine/wps_internals.h
index e2330a777e..a5fc70d1ef 100644
--- a/apps/gui/skin_engine/wps_internals.h
+++ b/apps/gui/skin_engine/wps_internals.h
@@ -226,15 +226,15 @@ struct touchregion {
struct skin_albumart {
/* Album art support */
struct viewport *vp;/* The viewport this is in */
- unsigned char wps_uses_albumart; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */
- short albumart_x;
- short albumart_y;
- unsigned char albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT */
- unsigned char albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */
- short albumart_max_width;
- short albumart_max_height;
+ int albumart_x;
+ int albumart_y;
+ int albumart_max_width;
+ int albumart_max_height;
bool draw;
+ unsigned char albumart_xalign; /* WPS_ALBUMART_ALIGN_LEFT, _CENTER, _RIGHT */
+ unsigned char albumart_yalign; /* WPS_ALBUMART_ALIGN_TOP, _CENTER, _BOTTOM */
+ unsigned char wps_uses_albumart; /* WPS_ALBUMART_NONE, _CHECK, _LOAD */
};
#endif