devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix logf builds on devices that support remotes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13202 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-04-18 17:49:32 +00:00
parent 36a2e30872
commit 392a4ef49b
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
apps/gui/icon.c
View file

@ -29,7 +29,7 @@
#include "filetypes.h" #include "filetypes.h"
#include <default_icons.h> #include <default_icons.h>
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
#include <remote_default_icons.h> #include <remote_default_icons.h>
#endif #endif
@ -47,14 +47,14 @@
so storing them as void* is ok. (stops compile warning) */ so storing them as void* is ok. (stops compile warning) */
static const void * inbuilt_icons[NB_SCREENS] = { static const void * inbuilt_icons[NB_SCREENS] = {
(void*)default_icons (void*)default_icons
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
, (void*)remote_default_icons , (void*)remote_default_icons
#endif #endif
}; };
static const int default_width[NB_SCREENS] = { static const int default_width[NB_SCREENS] = {
BMPWIDTH_default_icons BMPWIDTH_default_icons
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
, BMPWIDTH_remote_default_icons , BMPWIDTH_remote_default_icons
#endif #endif
}; };
@ -62,7 +62,7 @@ static const int default_width[NB_SCREENS] = {
/* height of whole file */ /* height of whole file */
static const int default_height[NB_SCREENS] = { static const int default_height[NB_SCREENS] = {
BMPHEIGHT_default_icons BMPHEIGHT_default_icons
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
, BMPHEIGHT_remote_default_icons , BMPHEIGHT_remote_default_icons
#endif #endif
}; };
@ -131,7 +131,7 @@ void screen_put_iconxy(struct screen * display,
if (!viewer_icons_loaded[screen] || if (!viewer_icons_loaded[screen] ||
(icon * height > viewer_iconset[screen].height)) (icon * height > viewer_iconset[screen].height))
{ {
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
if (screen == SCREEN_REMOTE) if (screen == SCREEN_REMOTE)
{ {
screen_put_iconxy(display, xpos, ypos, Icon_Questionmark); screen_put_iconxy(display, xpos, ypos, Icon_Questionmark);
@ -177,7 +177,7 @@ void screen_put_cursorxy(struct screen * display, int x, int y, bool on)
enum Iconset { enum Iconset {
Iconset_Mainscreen, Iconset_Mainscreen,
Iconset_Mainscreen_viewers, Iconset_Mainscreen_viewers,
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
Iconset_Remotescreen, Iconset_Remotescreen,
Iconset_Remotescreen_viewers, Iconset_Remotescreen_viewers,
#endif #endif
@ -203,7 +203,7 @@ static void load_icons(const char* filename, enum Iconset iconset,
bmp = &viewer_iconset[SCREEN_MAIN]; bmp = &viewer_iconset[SCREEN_MAIN];
bmp->data = viewer_icon_buffer[SCREEN_MAIN]; bmp->data = viewer_icon_buffer[SCREEN_MAIN];
break; break;
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
case Iconset_Remotescreen: case Iconset_Remotescreen:
loaded_ok = &custom_icons_loaded[SCREEN_REMOTE]; loaded_ok = &custom_icons_loaded[SCREEN_REMOTE];
bmp = &user_iconset[SCREEN_REMOTE]; bmp = &user_iconset[SCREEN_REMOTE];
@ -249,7 +249,7 @@ void icons_init(void)
load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers, false); load_icons(DEFAULT_VIEWER_BMP, Iconset_Mainscreen_viewers, false);
} }
#ifdef HAVE_REMOTE_LCD #if defined(HAVE_REMOTE_LCD) && (NB_SCREENS > 1)
load_icons(global_settings.remote_icon_file, load_icons(global_settings.remote_icon_file,
Iconset_Remotescreen, true); Iconset_Remotescreen, true);