From 9ac4b446106f733dc1c4be69d97acbcc4c44d9ad Mon Sep 17 00:00:00 2001 From: Jonathan Gordon Date: Wed, 9 Jun 2010 16:15:01 +0000 Subject: SKIN BREAK: %pb, %bl and %pv (bar types) changed so the image is the last param instead of the first. skin updater, skins and manual all updated. NEW PARSER: add an 'N' param type which will accept any number of strings, will cause very big problems if this isnt the last param for a tag. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26727 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/skin_engine/skin_parser.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'apps/gui/skin_engine') diff --git a/apps/gui/skin_engine/skin_parser.c b/apps/gui/skin_engine/skin_parser.c index 23b3d27cbb..561eb978a2 100644 --- a/apps/gui/skin_engine/skin_parser.c +++ b/apps/gui/skin_engine/skin_parser.c @@ -1245,11 +1245,15 @@ static int parse_progressbar(const char *wps_bufptr, using - for any of the params uses "sane" values */ #ifdef HAVE_LCD_BITMAP enum { - PB_FILENAME = 0, - PB_X, + PB_X = 0, PB_Y, PB_WIDTH, +<<<<<<< .mine PB_HEIGHT, + PB_FILENAME, +======= + PB_HEIGHT, +>>>>>>> .r26726 }; const char *filename; int x, y, height, width; @@ -1293,8 +1297,8 @@ static int parse_progressbar(const char *wps_bufptr, } ptr = wps_bufptr + 1; - if (!(ptr = parse_list("sdddd", &set, ',', ptr, &filename, - &x, &y, &width, &height))) + if (!(ptr = parse_list("dddds", &set, ',', ptr, + &x, &y, &width, &height, &filename))) return WPS_ERROR_INVALID_PARAM; if (LIST_VALUE_PARSED(set, PB_FILENAME)) /* filename */ -- cgit v1.2.3