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/settings.c | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'apps/settings.c')

diff --git a/apps/settings.c b/apps/settings.c
index 17e200812e..6cecffcb91 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -47,11 +47,9 @@
 #include "system.h"
 #include "general.h"
 #include "misc.h"
-#ifdef HAVE_LCD_BITMAP
 #include "icons.h"
 #include "font.h"
 #include "peakmeter.h"
-#endif
 #include "lang.h"
 #include "language.h"
 #include "powermgmt.h"
@@ -91,11 +89,7 @@ struct system_status global_status;
 #define NVRAM_BLOCK_SIZE (sizeof(struct system_status) + NVRAM_DATA_START)
 #endif
 
-#ifdef HAVE_LCD_BITMAP
 #define MAX_LINES 10
-#else
-#define MAX_LINES 2
-#endif
 
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
@@ -706,8 +700,6 @@ bool settings_save_config(int options)
 
 /** Apply and Reset settings **/
 
-
-#ifdef HAVE_LCD_BITMAP
 /*
  * Applies the range infos stored in global_settings to
  * the peak meter.
@@ -734,7 +726,6 @@ void settings_apply_pm_range(void)
     /* apply the range */
     peak_meter_init_range(global_settings.peak_meter_dbfs, pm_min, pm_max);
 }
-#endif /* HAVE_LCD_BITMAP */
 
 void sound_settings_apply(void)
 {
@@ -786,9 +777,7 @@ void sound_settings_apply(void)
 
 void settings_apply(bool read_disk)
 {
-#ifdef HAVE_LCD_BITMAP
     int rc;
-#endif
     CHART(">set_codepage");
     set_codepage(global_settings.default_codepage);
     CHART("<set_codepage");
@@ -864,7 +853,6 @@ void settings_apply(bool read_disk)
     set_battery_type(global_settings.battery_type);
 #endif
 
-#ifdef HAVE_LCD_BITMAP
 #ifdef HAVE_LCD_INVERT
     lcd_set_invert_display(global_settings.invert);
 #endif
@@ -877,7 +865,6 @@ void settings_apply(bool read_disk)
     peak_meter_init_times(
         global_settings.peak_meter_release, global_settings.peak_meter_hold,
         global_settings.peak_meter_clip_hold);
-#endif
 
 #ifdef HAVE_SPEAKER
     audio_enable_speaker(global_settings.speaker_mode);
@@ -886,7 +873,6 @@ void settings_apply(bool read_disk)
     if (read_disk)
     {
         char buf[MAX_PATH];
-#ifdef HAVE_LCD_BITMAP
         /* fonts need to be loaded before the WPS */
         if (global_settings.font_file[0]
             && global_settings.font_file[0] != '-') {
@@ -935,7 +921,6 @@ void settings_apply(bool read_disk)
         }
         else
             load_kbd(NULL);
-#endif /* HAVE_LCD_BITMAP */
         if ( global_settings.lang_file[0]) {
             snprintf(buf, sizeof buf, LANG_DIR "/%s.lng",
                      global_settings.lang_file);
@@ -967,11 +952,9 @@ void settings_apply(bool read_disk)
     screens[SCREEN_MAIN].set_background(global_settings.bg_color);
 #endif
 
-#ifdef HAVE_LCD_BITMAP
     lcd_scroll_step(global_settings.scroll_step);
     gui_list_screen_scroll_step(global_settings.screen_scroll_step);
     gui_list_screen_scroll_out_of_view(global_settings.offset_out_of_view);
-#endif
     lcd_bidir_scroll(global_settings.bidir_limit);
     lcd_scroll_delay(global_settings.scroll_delay);
 
@@ -1063,12 +1046,10 @@ void settings_apply(bool read_disk)
 #if defined(HAVE_RECORDING)
     enc_global_settings_apply();
 #endif
-#ifdef HAVE_LCD_BITMAP
     /* already called with THEME_STATUSBAR in settings_apply_skins() */
     CHART(">viewportmanager_theme_changed");
     viewportmanager_theme_changed(THEME_UI_VIEWPORT|THEME_LANGUAGE|THEME_BUTTONBAR);
     CHART("<viewportmanager_theme_changed");
-#endif
 }
 
 
@@ -1109,7 +1090,6 @@ void settings_reset(void)
 #if defined (HAVE_RECORDING)
     enc_global_settings_reset();
 #endif
-#ifdef HAVE_LCD_BITMAP
     FOR_NB_SCREENS(i)
     {
         if (screens[i].getuifont() > FONT_SYSFIXED)
@@ -1119,7 +1099,6 @@ void settings_reset(void)
             screens[i].setfont(FONT_SYSFIXED);
         }
     }
-#endif
 }
 
 /** Changing setting values **/
-- 
cgit