diff options
| -rw-r--r-- | apps/menu.c | 12 | ||||
| -rw-r--r-- | apps/tree.c | 6 | ||||
| -rw-r--r-- | apps/wps-display.c | 2 | ||||
| -rw-r--r-- | apps/wps.c | 8 |
4 files changed, 2 insertions, 26 deletions
diff --git a/apps/menu.c b/apps/menu.c index 1940c379bc..44510ebfc9 100644 --- a/apps/menu.c +++ b/apps/menu.c @@ -245,11 +245,6 @@ void menu_exit(int m) Menu menu_run(int m) { -#ifndef SIMULATOR -#ifdef HAVE_LCD_BITMAP - bool laststate; -#endif -#endif Menu result = MENU_OK; menu_draw(m); @@ -330,16 +325,11 @@ Menu menu_run(int m) #ifndef SIMULATOR case SYS_USB_CONNECTED: -#ifdef HAVE_LCD_BITMAP - laststate = statusbar(false); -#endif backlight_time(4); usb_acknowledge(SYS_USB_CONNECTED_ACK); usb_wait_for_disconnect(&button_queue); backlight_time(global_settings.backlight); -#ifdef HAVE_LCD_BITMAP - statusbar(laststate); -#else +#ifdef HAVE_LCD_CHARCELLS lcd_icon(ICON_PARAM, true); #endif menu_draw(m); diff --git a/apps/tree.c b/apps/tree.c index a7615b9738..1d615101fe 100644 --- a/apps/tree.c +++ b/apps/tree.c @@ -732,9 +732,6 @@ bool dirbrowse(char *root) #ifndef SIMULATOR case SYS_USB_CONNECTED: { -#ifdef HAVE_LCD_BITMAP - bool laststate=statusbar(false); -#endif backlight_time(4); /* Tell the USB thread that we are safe */ @@ -753,9 +750,6 @@ bool dirbrowse(char *root) dirlevel = 0; dircursor = 0; start = 0; -#ifdef HAVE_LCD_BITMAP - statusbar(laststate); -#endif } break; #endif diff --git a/apps/wps-display.c b/apps/wps-display.c index 0f27570e23..c360b7cf70 100644 --- a/apps/wps-display.c +++ b/apps/wps-display.c @@ -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); dynamic_lines[i] = flags.dynamic; -#ifdef HAVE_LCD_CHARCELLS +#if defined(HAVE_LCD_CHARCELLS) && !defined(SIMULATOR) if (flags.player_progress) draw_player_progress(id3, ff_rewind_count); #endif diff --git a/apps/wps.c b/apps/wps.c index 8576dbf973..6a672d1df3 100644 --- a/apps/wps.c +++ b/apps/wps.c @@ -166,10 +166,6 @@ void display_mute_text(bool muted) static void handle_usb(void) { #ifndef SIMULATOR -#ifdef HAVE_LCD_BITMAP - bool laststate=statusbar(false); -#endif - backlight_time(4); /* Tell the USB thread that we are safe */ @@ -180,10 +176,6 @@ static void handle_usb(void) usb_wait_for_disconnect(&button_queue); backlight_time(global_settings.backlight); - -#ifdef HAVE_LCD_BITMAP - statusbar(laststate); -#endif #endif } |