From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001
From: Solomon Peachy <pizza@shaftnet.org>
Date: Fri, 17 Jul 2020 10:31:31 -0400
Subject: [4/4]  Remove HAVE_LCD_BITMAP, as it's now the only choice.

Note:  I left behind lcd_bitmap in features.txt, because removing it
would require considerable work in the manual and the translations.

Change-Id: Ia8ca7761f610d9332a0d22a7d189775fb15ec88a
---
 apps/gui/usb_screen.c | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

(limited to 'apps/gui/usb_screen.c')

diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c
index dd1d97df3c..3169831322 100644
--- a/apps/gui/usb_screen.c
+++ b/apps/gui/usb_screen.c
@@ -42,9 +42,7 @@
 #include "playlist.h"
 #include "misc.h"
 
-#ifdef HAVE_LCD_BITMAP
 #include "bitmaps/usblogo.h"
-#endif
 
 #ifdef HAVE_REMOTE_LCD
 #include "bitmaps/remote_usblogo.h"
@@ -122,15 +120,12 @@ static int handle_usb_events(void)
 struct usb_screen_vps_t
 {
     struct viewport parent;
-#ifdef HAVE_LCD_BITMAP
     struct viewport logo;
 #ifdef USB_ENABLE_HID
     struct viewport title;
 #endif
-#endif
 };
 
-#ifdef HAVE_LCD_BITMAP
 static void usb_screen_fix_viewports(struct screen *screen,
         struct usb_screen_vps_t *usb_screen_vps)
 {
@@ -181,18 +176,15 @@ static void usb_screen_fix_viewports(struct screen *screen,
     }
 #endif
 }
-#endif
 
 static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 {
-#ifdef HAVE_LCD_BITMAP
     static const struct bitmap* logos[NB_SCREENS] = {
         &bm_usblogo,
 #ifdef HAVE_REMOTE_LCD
         &bm_remote_usblogo,
 #endif
     };
-#endif
 
     FOR_NB_SCREENS(i)
     {
@@ -200,15 +192,12 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
 
         struct usb_screen_vps_t *usb_screen_vps = &usb_screen_vps_ar[i];
         struct viewport *parent = &usb_screen_vps->parent;
-#ifdef HAVE_LCD_BITMAP
         struct viewport *logo = &usb_screen_vps->logo;
-#endif
 
         screen->set_viewport(parent);
         screen->clear_viewport();
         screen->backlight_on();
 
-#ifdef HAVE_LCD_BITMAP
         screen->set_viewport(logo);
         screen->bmp(logos[i], 0, 0);
         if (i == SCREEN_MAIN)
@@ -228,14 +217,6 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar)
         }
         screen->set_viewport(parent);
 
-#else /* !HAVE_LCD_BITMAP */
-        screen->double_height(false);
-        screen->puts_scroll(0, 0, "[USB Mode]");
-        status_set_param(false);
-        status_set_audio(false);
-        status_set_usb(true);
-#endif /* HAVE_LCD_BITMAP */
-
         screen->set_viewport(NULL);
         screen->update_viewport();
     }
@@ -275,13 +256,11 @@ void gui_usb_screen_run(bool early_usb)
     /* update the UI before disabling fonts, this maximizes the propability
      * that font cache lookups succeed during USB */
     send_event(GUI_EVENT_ACTIONUPDATE, NULL);
-#ifdef HAVE_LCD_BITMAP
     if(!early_usb)
     {
         /* The font system leaves the .fnt fd's open, so we need for force close them all */
         font_disable_all();
     }
-#endif
 
     usb_acknowledge(SYS_USB_CONNECTED_ACK);
 
@@ -302,10 +281,8 @@ void gui_usb_screen_run(bool early_usb)
     {
         const struct viewport* vp = NULL;
 
-#if defined(HAVE_LCD_BITMAP) && defined(USB_ENABLE_HID)
+#if defined(USB_ENABLE_HID)
         vp = usb_hid ? &usb_screen_vps_ar[i].title : NULL;
-#elif !defined(HAVE_LCD_BITMAP)
-        vp = &usb_screen_vps_ar[i].parent;
 #endif
         if (vp)
             screens[i].scroll_stop_viewport(vp);
@@ -322,7 +299,6 @@ void gui_usb_screen_run(bool early_usb)
     touchscreen_set_mode(old_mode);
 #endif
 
-#ifdef HAVE_LCD_BITMAP
     if(!early_usb)
     {
         font_enable_all();
@@ -331,7 +307,6 @@ void gui_usb_screen_run(bool early_usb)
         /* Reload playlist */
         playlist_resume();
     }
-#endif
 
     FOR_NB_SCREENS(i)
     {
-- 
cgit v1.2.3