1
0
Fork 0
forked from len0rd/rockbox

Fixed build errors

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@2113 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Björn Stenberg 2002-09-01 20:08:08 +00:00
parent 862813d37b
commit 40d866bd9e
4 changed files with 2 additions and 26 deletions

View file

@ -245,11 +245,6 @@ void menu_exit(int m)
Menu menu_run(int m) Menu menu_run(int m)
{ {
#ifndef SIMULATOR
#ifdef HAVE_LCD_BITMAP
bool laststate;
#endif
#endif
Menu result = MENU_OK; Menu result = MENU_OK;
menu_draw(m); menu_draw(m);
@ -330,16 +325,11 @@ Menu menu_run(int m)
#ifndef SIMULATOR #ifndef SIMULATOR
case SYS_USB_CONNECTED: case SYS_USB_CONNECTED:
#ifdef HAVE_LCD_BITMAP
laststate = statusbar(false);
#endif
backlight_time(4); backlight_time(4);
usb_acknowledge(SYS_USB_CONNECTED_ACK); usb_acknowledge(SYS_USB_CONNECTED_ACK);
usb_wait_for_disconnect(&button_queue); usb_wait_for_disconnect(&button_queue);
backlight_time(global_settings.backlight); backlight_time(global_settings.backlight);
#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_CHARCELLS
statusbar(laststate);
#else
lcd_icon(ICON_PARAM, true); lcd_icon(ICON_PARAM, true);
#endif #endif
menu_draw(m); menu_draw(m);

View file

@ -732,9 +732,6 @@ bool dirbrowse(char *root)
#ifndef SIMULATOR #ifndef SIMULATOR
case SYS_USB_CONNECTED: { case SYS_USB_CONNECTED: {
#ifdef HAVE_LCD_BITMAP
bool laststate=statusbar(false);
#endif
backlight_time(4); backlight_time(4);
/* Tell the USB thread that we are safe */ /* Tell the USB thread that we are safe */
@ -753,9 +750,6 @@ bool dirbrowse(char *root)
dirlevel = 0; dirlevel = 0;
dircursor = 0; dircursor = 0;
start = 0; start = 0;
#ifdef HAVE_LCD_BITMAP
statusbar(laststate);
#endif
} }
break; break;
#endif #endif

View file

@ -526,7 +526,7 @@ bool wps_refresh(struct mp3entry* id3, int ffwd_offset, bool refresh_all)
format_display(buf, sizeof(buf), id3, format_lines[i], &flags); format_display(buf, sizeof(buf), id3, format_lines[i], &flags);
dynamic_lines[i] = flags.dynamic; dynamic_lines[i] = flags.dynamic;
#ifdef HAVE_LCD_CHARCELLS #if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR)
if (flags.player_progress) if (flags.player_progress)
draw_player_progress(id3, ff_rewind_count); draw_player_progress(id3, ff_rewind_count);
#endif #endif

View file

@ -166,10 +166,6 @@ void display_mute_text(bool muted)
static void handle_usb(void) static void handle_usb(void)
{ {
#ifndef SIMULATOR #ifndef SIMULATOR
#ifdef HAVE_LCD_BITMAP
bool laststate=statusbar(false);
#endif
backlight_time(4); backlight_time(4);
/* Tell the USB thread that we are safe */ /* Tell the USB thread that we are safe */
@ -180,10 +176,6 @@ static void handle_usb(void)
usb_wait_for_disconnect(&button_queue); usb_wait_for_disconnect(&button_queue);
backlight_time(global_settings.backlight); backlight_time(global_settings.backlight);
#ifdef HAVE_LCD_BITMAP
statusbar(laststate);
#endif
#endif #endif
} }