forked from len0rd/rockbox
Fix yellow, and at the same time simplify some #ifdefs
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16823 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
b9bb723f12
commit
fa1da20d3a
1 changed files with 15 additions and 8 deletions
|
@ -1429,17 +1429,24 @@ static bool load_wps_bitmaps(struct wps_data *wps_data, char *bmpdir)
|
||||||
{
|
{
|
||||||
get_image_filename(bmp_names[BACKDROP_BMP], bmpdir,
|
get_image_filename(bmp_names[BACKDROP_BMP], bmpdir,
|
||||||
img_path, sizeof(img_path));
|
img_path, sizeof(img_path));
|
||||||
#ifdef HAVE_REMOTE_LCD
|
|
||||||
if (wps_data->remote_wps)
|
#if defined(HAVE_REMOTE_LCD)
|
||||||
#if LCD_REMOTE_DEPTH > 1
|
/* We only need to check LCD type if there is a remote LCD */
|
||||||
if (!load_remote_wps_backdrop(img_path))
|
if (!wps_data->remote_wps)
|
||||||
return false
|
|
||||||
#endif
|
#endif
|
||||||
;
|
{
|
||||||
else
|
/* Load backdrop for the main LCD */
|
||||||
#endif /* HAVE_REMOTE_LCD */
|
|
||||||
if (!load_wps_backdrop(img_path))
|
if (!load_wps_backdrop(img_path))
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
#if defined(HAVE_REMOTE_LCD) && LCD_REMOTE_DEPTH > 1
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Load backdrop for the remote LCD */
|
||||||
|
if (!load_remote_wps_backdrop(img_path))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
#endif /* has backdrop support */
|
#endif /* has backdrop support */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue