summaryrefslogtreecommitdiffstats
path: root/apps/settings.h
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-07-17 10:31:31 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-07-24 21:20:13 +0000
commit658026e6267277b27d297c481728f74d160a8481 (patch)
tree915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/settings.h
parent8cb555460ff79e636a7907fb2589e16db98c8600 (diff)
downloadrockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz
rockbox-658026e6267277b27d297c481728f74d160a8481.tar.bz2
rockbox-658026e6267277b27d297c481728f74d160a8481.zip
[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
Diffstat (limited to 'apps/settings.h')
-rw-r--r--apps/settings.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/apps/settings.h b/apps/settings.h
index 3d3939695c..405a31d052 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -286,9 +286,7 @@ struct system_status
signed char last_screen;
int viewer_icon_count;
int last_volume_change; /* tick the last volume change happened. skins use this */
-#ifdef HAVE_LCD_BITMAP
int font_id[NB_SCREENS]; /* font id of the settings font for each screen */
-#endif
};
@@ -494,9 +492,7 @@ struct user_settings
int peak_meter_max; /* range maximum */
unsigned char wps_file[MAX_FILENAME+1]; /* last wps */
-#ifdef HAVE_LCD_BITMAP
unsigned char sbs_file[MAX_FILENAME+1]; /* last statusbar skin */
-#endif
#ifdef HAVE_REMOTE_LCD
unsigned char rwps_file[MAX_FILENAME+1]; /* last remote-wps */
unsigned char rsbs_file[MAX_FILENAME+1]; /* last remote statusbar skin */
@@ -514,7 +510,6 @@ struct user_settings
int remote_statusbar;
#endif
-#ifdef HAVE_LCD_BITMAP
int scrollbar; /* SCROLLBAR_* enum values */
int scrollbar_width;
@@ -525,7 +520,6 @@ struct user_settings
int list_separator_height; /* -1=auto (== 1 currently), 0=disabled, X=height in pixels */
int list_separator_color;
#endif
-#endif
/* goto current song when exiting WPS */
bool browse_current; /* 1=goto current song,
0=goto previous location */
@@ -621,7 +615,6 @@ struct user_settings
int contrast; /* lcd contrast */
#endif
-#ifdef HAVE_LCD_BITMAP
#ifdef HAVE_LCD_INVERT
bool invert; /* invert display */
#endif
@@ -640,7 +633,6 @@ struct user_settings
unsigned char remote_font_file[MAX_FILENAME+1]; /* last font */
#endif
unsigned char kbd_file[MAX_FILENAME+1]; /* last keyboard */
-#endif /* HAVE_LCD_BITMAP */
int backlight_timeout; /* backlight off timeout: -1=never,
0=always, or time in seconds */
bool caption_backlight; /* turn on backlight at end and start of track */
@@ -748,12 +740,10 @@ struct user_settings
bool usb_skip_first_drive;
#endif
-#ifdef HAVE_LCD_BITMAP
unsigned char ui_vp_config[64]; /* viewport string for the lists */
#ifdef HAVE_REMOTE_LCD
unsigned char remote_ui_vp_config[64]; /* viewport string for the remote lists */
#endif
-#endif
struct compressor_settings compressor_settings;