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

Move definition of mode_name outside #ifdef

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22915 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Tomer Shalev 2009-10-04 14:16:32 +00:00
parent 9546e4093d
commit bcaa113179
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
apps/screens.c
View file

@ -195,22 +195,21 @@ void usb_screen(void)
else else
#endif #endif
{ {
char mode_name[MODE_NAME_LEN];
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_BITMAP
screens[i].transparent_bitmap(usblogo, screens[i].transparent_bitmap(usblogo,
(LCD_WIDTH-BMPWIDTH_usblogo), (LCD_WIDTH-BMPWIDTH_usblogo),
(LCD_HEIGHT-BMPHEIGHT_usblogo)/2, (LCD_HEIGHT-BMPHEIGHT_usblogo)/2,
BMPWIDTH_usblogo, BMPHEIGHT_usblogo); BMPWIDTH_usblogo, BMPHEIGHT_usblogo);
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
char mode_name[MODE_NAME_LEN];
int w, h; int w, h;
snprintf(mode_name, MODE_NAME_LEN, "%s", snprintf(mode_name, MODE_NAME_LEN, "%s",
str(keypad_mode_name_get())); str(keypad_mode_name_get()));
screens[i].getstringsize(mode_name, &w, &h); screens[i].getstringsize(mode_name, &w, &h);
screens[i].putsxy((LCD_WIDTH - w) / 2, BMPHEIGHT_usblogo + screens[i].putsxy((LCD_WIDTH - w) / 2, BMPHEIGHT_usblogo +
(LCD_HEIGHT - BMPHEIGHT_usblogo + h) / 2, mode_name); (LCD_HEIGHT - BMPHEIGHT_usblogo + h) / 2, mode_name);
#endif /* HID */ #endif /* USB_ENABLE_HID */
#else /* HAVE_LCD_BITMAP */ #else /* HAVE_LCD_BITMAP */
screens[i].double_height(false); screens[i].double_height(false);
#ifdef USB_ENABLE_HID #ifdef USB_ENABLE_HID
@ -219,7 +218,7 @@ void usb_screen(void)
screens[i].puts_scroll(0, 0, mode_name); screens[i].puts_scroll(0, 0, mode_name);
#else #else
screens[i].puts_scroll(0, 0, "[USB Mode]"); screens[i].puts_scroll(0, 0, "[USB Mode]");
#endif #endif /* USB_ENABLE_HID */
status_set_param(false); status_set_param(false);
status_set_audio(false); status_set_audio(false);
status_set_usb(true); status_set_usb(true);