From 0602dbce4e1462e018f5c5cc983849b55b0bee0c Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 13 Nov 2011 15:44:27 +0000 Subject: Fix typos in usb_screen.c and use lcd_remote_bmp() for showing the rockbox logo on remotes as well. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30972 a1c6a512-1295-4272-9138-f99709370657 --- apps/gui/usb_screen.c | 7 +++++-- apps/misc.c | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index 002f4557bb..efa6086df2 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -184,12 +184,15 @@ static void usb_screen_fix_viewports(struct screen *screen, static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) { +#ifdef LCD_BITMAP static const struct bitmap* logos[NB_SCREENS] = { &bm_usblogo, -#ifdef HAVE_RE +#ifdef HAVE_REMOTE_LCD &bm_remote_usblogo, #endif }; +#endif + FOR_NB_SCREENS(i) { struct screen *screen = &screens[i]; @@ -224,7 +227,7 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) } screen->set_viewport(parent); -#else /* HAVE_LCD_BITMAP */ +#else /* !HAVE_LCD_BITMAP */ screen->double_height(false); screen->puts_scroll(0, 0, "[USB Mode]"); status_set_param(false); diff --git a/apps/misc.c b/apps/misc.c index 271e4e1fd1..0608595d21 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -713,8 +713,7 @@ int show_logo( void ) #ifdef HAVE_REMOTE_LCD lcd_remote_clear_display(); - lcd_remote_bitmap(remote_rockboxlogo, 0, 10, BMPWIDTH_remote_rockboxlogo, - BMPHEIGHT_remote_rockboxlogo); + lcd_remote_bmp(&bm_remote_rockboxlogo, 0, 10); lcd_remote_setfont(FONT_SYSFIXED); lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), -- cgit v1.2.3