diff options
author | Thomas Martitz <kugel@rockbox.org> | 2011-11-13 15:44:27 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2011-11-13 15:44:27 +0000 |
commit | 0602dbce4e1462e018f5c5cc983849b55b0bee0c (patch) | |
tree | a4c0088807e54f125e623dc7c2b7304487aa342a /apps | |
parent | 9a70c42241c70e57bbe739f45d254c67bacc83e7 (diff) | |
download | rockbox-0602dbce4e1462e018f5c5cc983849b55b0bee0c.tar.gz rockbox-0602dbce4e1462e018f5c5cc983849b55b0bee0c.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/usb_screen.c | 7 | ||||
-rw-r--r-- | 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, | |||
184 | 184 | ||
185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | 185 | static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) |
186 | { | 186 | { |
187 | #ifdef LCD_BITMAP | ||
187 | static const struct bitmap* logos[NB_SCREENS] = { | 188 | static const struct bitmap* logos[NB_SCREENS] = { |
188 | &bm_usblogo, | 189 | &bm_usblogo, |
189 | #ifdef HAVE_RE | 190 | #ifdef HAVE_REMOTE_LCD |
190 | &bm_remote_usblogo, | 191 | &bm_remote_usblogo, |
191 | #endif | 192 | #endif |
192 | }; | 193 | }; |
194 | #endif | ||
195 | |||
193 | FOR_NB_SCREENS(i) | 196 | FOR_NB_SCREENS(i) |
194 | { | 197 | { |
195 | struct screen *screen = &screens[i]; | 198 | struct screen *screen = &screens[i]; |
@@ -224,7 +227,7 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) | |||
224 | } | 227 | } |
225 | screen->set_viewport(parent); | 228 | screen->set_viewport(parent); |
226 | 229 | ||
227 | #else /* HAVE_LCD_BITMAP */ | 230 | #else /* !HAVE_LCD_BITMAP */ |
228 | screen->double_height(false); | 231 | screen->double_height(false); |
229 | screen->puts_scroll(0, 0, "[USB Mode]"); | 232 | screen->puts_scroll(0, 0, "[USB Mode]"); |
230 | status_set_param(false); | 233 | 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 ) | |||
713 | 713 | ||
714 | #ifdef HAVE_REMOTE_LCD | 714 | #ifdef HAVE_REMOTE_LCD |
715 | lcd_remote_clear_display(); | 715 | lcd_remote_clear_display(); |
716 | lcd_remote_bitmap(remote_rockboxlogo, 0, 10, BMPWIDTH_remote_rockboxlogo, | 716 | lcd_remote_bmp(&bm_remote_rockboxlogo, 0, 10); |
717 | BMPHEIGHT_remote_rockboxlogo); | ||
718 | lcd_remote_setfont(FONT_SYSFIXED); | 717 | lcd_remote_setfont(FONT_SYSFIXED); |
719 | lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); | 718 | lcd_remote_getstringsize((unsigned char *)"A", &font_w, &font_h); |
720 | lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), | 719 | lcd_remote_putsxy((LCD_REMOTE_WIDTH/2) - ((strlen(version)*font_w)/2), |