From 66459fee3ddcabd2a98720ca482d22a1656eeba6 Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Mon, 8 Dec 2008 08:32:30 +0000 Subject: Fix red player build git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19362 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/wps_parser.c | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index e66543d8c7..c36a375a1c 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c @@ -731,6 +731,36 @@ static int parse_viewport(const char *wps_bufptr, return skip_end_of_line(wps_bufptr); } +#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) +static int parse_image_special(const char *wps_bufptr, + struct wps_token *token, + struct wps_data *wps_data) +{ + (void)wps_data; /* kill warning */ + (void)token; + const char *pos = NULL; + const char *newline; + + pos = strchr(wps_bufptr + 1, '|'); + newline = strchr(wps_bufptr, '\n'); + + if (pos > newline) + return WPS_ERROR_INVALID_PARAM; +#if LCD_DEPTH > 1 + if (token->type == WPS_TOKEN_IMAGE_BACKDROP) + { + /* format: %X|filename.bmp| */ + bmp_names[BACKDROP_BMP] = wps_bufptr + 1; + } +#endif + + /* Skip the rest of the line */ + return skip_end_of_line(wps_bufptr); +} +#endif + +#endif /* HAVE_LCD_BITMAP */ + static int parse_setting(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data) @@ -766,36 +796,6 @@ static int parse_setting(const char *wps_bufptr, } -#if (LCD_DEPTH > 1) || (defined(HAVE_REMOTE_LCD) && (LCD_REMOTE_DEPTH > 1)) -static int parse_image_special(const char *wps_bufptr, - struct wps_token *token, - struct wps_data *wps_data) -{ - (void)wps_data; /* kill warning */ - (void)token; - const char *pos = NULL; - const char *newline; - - pos = strchr(wps_bufptr + 1, '|'); - newline = strchr(wps_bufptr, '\n'); - - if (pos > newline) - return WPS_ERROR_INVALID_PARAM; -#if LCD_DEPTH > 1 - if (token->type == WPS_TOKEN_IMAGE_BACKDROP) - { - /* format: %X|filename.bmp| */ - bmp_names[BACKDROP_BMP] = wps_bufptr + 1; - } -#endif - - /* Skip the rest of the line */ - return skip_end_of_line(wps_bufptr); -} -#endif - -#endif /* HAVE_LCD_BITMAP */ - static int parse_dir_level(const char *wps_bufptr, struct wps_token *token, struct wps_data *wps_data) -- cgit v1.2.3