diff options
author | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-04-25 21:44:56 +0000 |
---|---|---|
committer | Nicolas Pennequin <nicolas.pennequin@free.fr> | 2007-04-25 21:44:56 +0000 |
commit | 7fdfa56454c0fab8cbdfcf50d852dc6fa90d4435 (patch) | |
tree | e59f8442d401de4c58750c793276ac8a65de67ae /apps/gui/wps_parser.c | |
parent | 205ec3279d32a152f6046ecc6ad66c39f097fa4d (diff) | |
download | rockbox-7fdfa56454c0fab8cbdfcf50d852dc6fa90d4435.tar.gz rockbox-7fdfa56454c0fab8cbdfcf50d852dc6fa90d4435.zip |
Add backdrop support for LCD remotes with depth > 1-bit. Only WPS backdrops, but the groundwork is laid for main backdrops too (all that's really needed are menus to set/clear them).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13263 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/gui/wps_parser.c')
-rw-r--r-- | apps/gui/wps_parser.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/apps/gui/wps_parser.c b/apps/gui/wps_parser.c index b6cda91e74..2b5d1bb321 100644 --- a/apps/gui/wps_parser.c +++ b/apps/gui/wps_parser.c | |||
@@ -257,7 +257,7 @@ static const struct wps_tag all_tags[] = { | |||
257 | 257 | ||
258 | { WPS_TOKEN_IMAGE_DISPLAY, "x", 0, parse_image_load }, | 258 | { WPS_TOKEN_IMAGE_DISPLAY, "x", 0, parse_image_load }, |
259 | { WPS_TOKEN_IMAGE_PROGRESS_BAR, "P", 0, parse_image_special }, | 259 | { WPS_TOKEN_IMAGE_PROGRESS_BAR, "P", 0, parse_image_special }, |
260 | #if LCD_DEPTH > 1 | 260 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
261 | { WPS_TOKEN_IMAGE_BACKDROP, "X", 0, parse_image_special }, | 261 | { WPS_TOKEN_IMAGE_BACKDROP, "X", 0, parse_image_special }, |
262 | #endif | 262 | #endif |
263 | #endif | 263 | #endif |
@@ -908,17 +908,22 @@ static void load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir) | |||
908 | } | 908 | } |
909 | } | 909 | } |
910 | 910 | ||
911 | #if LCD_DEPTH > 1 | 911 | #if (LCD_DEPTH > 1) || (defined(HAVE_LCD_REMOTE) && (LCD_REMOTE_DEPTH > 1)) |
912 | if (backdrop_bmp_name) | ||
913 | { | ||
914 | get_image_filename(backdrop_bmp_name, bmpdir, | ||
915 | img_path, sizeof(img_path)); | ||
912 | #ifdef HAVE_REMOTE_LCD | 916 | #ifdef HAVE_REMOTE_LCD |
913 | if (!wps_data->remote_wps) | 917 | if (wps_data->remote_wps) |
918 | #if LCD_REMOTE_DEPTH > 1 | ||
919 | load_remote_wps_backdrop(img_path) | ||
914 | #endif | 920 | #endif |
915 | if (backdrop_bmp_name) | 921 | ; |
916 | { | 922 | else |
917 | get_image_filename(backdrop_bmp_name, bmpdir, | 923 | #endif /* HAVE_REMOTE_LCD */ |
918 | img_path, sizeof(img_path)); | ||
919 | load_wps_backdrop(img_path); | 924 | load_wps_backdrop(img_path); |
920 | } | 925 | } |
921 | #endif | 926 | #endif /* has backdrop support */ |
922 | } | 927 | } |
923 | 928 | ||
924 | #endif /* HAVE_LCD_BITMAP */ | 929 | #endif /* HAVE_LCD_BITMAP */ |