len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 10:37:38 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typos in usb_screen.c and use lcd_remote_bmp() for showing the rockbox logo on remotes as well.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30972 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2011-11-13 15:44:27 +00:00
parent 9a70c42241
commit 0602dbce4e
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/gui/usb_screen.c
View file

@ -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) static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
{ {
#ifdef LCD_BITMAP
static const struct bitmap* logos[NB_SCREENS] = { static const struct bitmap* logos[NB_SCREENS] = {
&bm_usblogo, &bm_usblogo,
#ifdef HAVE_RE #ifdef HAVE_REMOTE_LCD
&bm_remote_usblogo, &bm_remote_usblogo,
#endif #endif
}; };
#endif
FOR_NB_SCREENS(i) FOR_NB_SCREENS(i)
{ {
struct screen *screen = &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); screen->set_viewport(parent);
#else /* HAVE_LCD_BITMAP */ #else /* !HAVE_LCD_BITMAP */
screen->double_height(false); screen->double_height(false);
screen->puts_scroll(0, 0, "[USB Mode]"); screen->puts_scroll(0, 0, "[USB Mode]");
status_set_param(false); status_set_param(false);

3
apps/misc.c
View file

@ -713,8 +713,7 @@ int show_logo( void )
#ifdef HAVE_REMOTE_LCD #ifdef HAVE_REMOTE_LCD
lcd_remote_clear_display(); lcd_remote_clear_display();
lcd_remote_bitmap(remote_rockboxlogo, 0, 10, BMPWIDTH_remote_rockboxlogo, lcd_remote_bmp(&bm_remote_rockboxlogo, 0, 10);
BMPHEIGHT_remote_rockboxlogo);
lcd_remote_setfont(FONT_SYSFIXED); lcd_remote_setfont(FONT_SYSFIXED);
lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h);
lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2),