diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-17 10:31:31 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 658026e6267277b27d297c481728f74d160a8481 (patch) | |
tree | 915a9d2bb48469bdd5b9127dc19a61f230721a6c /apps/settings_list.c | |
parent | 8cb555460ff79e636a7907fb2589e16db98c8600 (diff) | |
download | rockbox-658026e6267277b27d297c481728f74d160a8481.tar.gz 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_list.c')
-rw-r--r-- | apps/settings_list.c | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 7f6f4fefc7..e5e523da93 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
@@ -43,9 +43,7 @@ | |||
43 | #endif | 43 | #endif |
44 | #include "list.h" | 44 | #include "list.h" |
45 | #include "rbunicode.h" | 45 | #include "rbunicode.h" |
46 | #ifdef HAVE_LCD_BITMAP | ||
47 | #include "peakmeter.h" | 46 | #include "peakmeter.h" |
48 | #endif | ||
49 | #include "menus/eq_menu.h" | 47 | #include "menus/eq_menu.h" |
50 | #if CONFIG_TUNER | 48 | #if CONFIG_TUNER |
51 | #include "radio.h" | 49 | #include "radio.h" |
@@ -219,17 +217,13 @@ static const int time_recording_trigger[] = {0,1,2,5,10,15,20,25,30,60,120,300,6 | |||
219 | static const int backlight_fade[] = {0,100,200,300,500,1000,2000,3000,5000,10000}; | 217 | static const int backlight_fade[] = {0,100,200,300,500,1000,2000,3000,5000,10000}; |
220 | #endif | 218 | #endif |
221 | 219 | ||
222 | #ifdef HAVE_LCD_BITMAP | ||
223 | static const char graphic_numeric[] = "graphic,numeric"; | 220 | static const char graphic_numeric[] = "graphic,numeric"; |
224 | #endif | ||
225 | 221 | ||
226 | /* Default theme settings */ | 222 | /* Default theme settings */ |
227 | #define DEFAULT_WPSNAME "cabbiev2" | 223 | #define DEFAULT_WPSNAME "cabbiev2" |
228 | #define DEFAULT_SBSNAME "-" | 224 | #define DEFAULT_SBSNAME "-" |
229 | #define DEFAULT_FMS_NAME "cabbiev2" | 225 | #define DEFAULT_FMS_NAME "cabbiev2" |
230 | 226 | ||
231 | #ifdef HAVE_LCD_BITMAP | ||
232 | |||
233 | #if LCD_HEIGHT <= 64 | 227 | #if LCD_HEIGHT <= 64 |
234 | #define DEFAULT_FONT_HEIGHT 8 | 228 | #define DEFAULT_FONT_HEIGHT 8 |
235 | #define DEFAULT_FONTNAME "08-Rockfont" | 229 | #define DEFAULT_FONTNAME "08-Rockfont" |
@@ -255,10 +249,6 @@ static const char graphic_numeric[] = "graphic,numeric"; | |||
255 | #define MIN_GLYPHS 50 | 249 | #define MIN_GLYPHS 50 |
256 | #define MAX_GLYPHS 65540 | 250 | #define MAX_GLYPHS 65540 |
257 | 251 | ||
258 | #else | ||
259 | #define DEFAULT_FONT_HEIGHT 12 | ||
260 | #endif | ||
261 | |||
262 | #ifndef DEFAULT_FONTNAME | 252 | #ifndef DEFAULT_FONTNAME |
263 | /* ugly expansion needed */ | 253 | /* ugly expansion needed */ |
264 | #define _EXPAND2(x) #x | 254 | #define _EXPAND2(x) #x |
@@ -438,7 +428,6 @@ static int32_t getlang_time_unit_0_is_skip_track(int value, int unit) | |||
438 | return talk_time_intervals(value, unit, false); | 428 | return talk_time_intervals(value, unit, false); |
439 | } | 429 | } |
440 | 430 | ||
441 | #ifdef HAVE_LCD_BITMAP | ||
442 | static const char* formatter_time_unit_0_is_eternal(char *buffer, | 431 | static const char* formatter_time_unit_0_is_eternal(char *buffer, |
443 | size_t buffer_size, int val, const char *unit) | 432 | size_t buffer_size, int val, const char *unit) |
444 | { | 433 | { |
@@ -455,7 +444,6 @@ static int32_t getlang_time_unit_0_is_eternal(int value, int unit) | |||
455 | else | 444 | else |
456 | return talk_time_intervals(value, unit, false); | 445 | return talk_time_intervals(value, unit, false); |
457 | } | 446 | } |
458 | #endif /* HAVE_LCD_BITMAP */ | ||
459 | 447 | ||
460 | #ifndef HAVE_WHEEL_ACCELERATION | 448 | #ifndef HAVE_WHEEL_ACCELERATION |
461 | static const char* scanaccel_formatter(char *buffer, size_t buffer_size, | 449 | static const char* scanaccel_formatter(char *buffer, size_t buffer_size, |
@@ -907,7 +895,6 @@ const struct settings_list settings[] = { | |||
907 | 23, timeout_sec_common), | 895 | 23, timeout_sec_common), |
908 | #endif | 896 | #endif |
909 | #endif /* HAVE_BACKLIGHT */ | 897 | #endif /* HAVE_BACKLIGHT */ |
910 | #ifdef HAVE_LCD_BITMAP | ||
911 | #ifdef HAVE_LCD_INVERT | 898 | #ifdef HAVE_LCD_INVERT |
912 | BOOL_SETTING(0, invert, LANG_INVERT, false ,"invert", off_on, | 899 | BOOL_SETTING(0, invert, LANG_INVERT, false ,"invert", off_on, |
913 | LANG_INVERT_LCD_INVERSE, LANG_NORMAL, lcd_set_invert_display), | 900 | LANG_INVERT_LCD_INVERSE, LANG_NORMAL, lcd_set_invert_display), |
@@ -972,7 +959,6 @@ const struct settings_list settings[] = { | |||
972 | CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0, | 959 | CHOICE_SETTING(0, timeformat, LANG_TIMEFORMAT, 0, |
973 | "time format", "24hour,12hour", NULL, 2, | 960 | "time format", "24hour,12hour", NULL, 2, |
974 | ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)), | 961 | ID2P(LANG_24_HOUR_CLOCK), ID2P(LANG_12_HOUR_CLOCK)), |
975 | #endif /* HAVE_LCD_BITMAP */ | ||
976 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), | 962 | OFFON_SETTING(0,show_icons, LANG_SHOW_ICONS ,true,"show icons", NULL), |
977 | /* system */ | 963 | /* system */ |
978 | INT_SETTING(F_TIME_SETTING, poweroff, LANG_POWEROFF_IDLE, 10, | 964 | INT_SETTING(F_TIME_SETTING, poweroff, LANG_POWEROFF_IDLE, 10, |
@@ -1170,7 +1156,6 @@ const struct settings_list settings[] = { | |||
1170 | "remote bidir limit", UNIT_PERCENT, 0, 200, 25, NULL, NULL, | 1156 | "remote bidir limit", UNIT_PERCENT, 0, 200, 25, NULL, NULL, |
1171 | lcd_remote_bidir_scroll), | 1157 | lcd_remote_bidir_scroll), |
1172 | #endif | 1158 | #endif |
1173 | #ifdef HAVE_LCD_BITMAP | ||
1174 | OFFON_SETTING(0, offset_out_of_view, LANG_SCREEN_SCROLL_VIEW, | 1159 | OFFON_SETTING(0, offset_out_of_view, LANG_SCREEN_SCROLL_VIEW, |
1175 | false, "Screen Scrolls Out Of View", | 1160 | false, "Screen Scrolls Out Of View", |
1176 | gui_list_screen_scroll_out_of_view), | 1161 | gui_list_screen_scroll_out_of_view), |
@@ -1179,7 +1164,6 @@ const struct settings_list settings[] = { | |||
1179 | INT_SETTING(F_PADTITLE, screen_scroll_step, LANG_SCREEN_SCROLL_STEP, 16, | 1164 | INT_SETTING(F_PADTITLE, screen_scroll_step, LANG_SCREEN_SCROLL_STEP, 16, |
1180 | "screen scroll step", UNIT_PIXEL, 1, LCD_WIDTH, 1, NULL, NULL, | 1165 | "screen scroll step", UNIT_PIXEL, 1, LCD_WIDTH, 1, NULL, NULL, |
1181 | gui_list_screen_scroll_step), | 1166 | gui_list_screen_scroll_step), |
1182 | #endif /* HAVE_LCD_BITMAP */ | ||
1183 | OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, | 1167 | OFFON_SETTING(0,scroll_paginated,LANG_SCROLL_PAGINATED, |
1184 | false,"scroll paginated",NULL), | 1168 | false,"scroll paginated",NULL), |
1185 | #ifdef HAVE_LCD_COLOR | 1169 | #ifdef HAVE_LCD_COLOR |
@@ -1274,7 +1258,6 @@ const struct settings_list settings[] = { | |||
1274 | ID2P(LANG_SET_BOOL_YES), | 1258 | ID2P(LANG_SET_BOOL_YES), |
1275 | ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST), | 1259 | ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_PLAYLIST), |
1276 | ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK)), | 1260 | ID2P(LANG_BOOKMARK_SETTINGS_ONE_PER_TRACK)), |
1277 | #ifdef HAVE_LCD_BITMAP | ||
1278 | /* peak meter */ | 1261 | /* peak meter */ |
1279 | TABLE_SETTING_LIST(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, peak_meter_clip_hold, | 1262 | TABLE_SETTING_LIST(F_TIME_SETTING | F_ALLOW_ARBITRARY_VALS, peak_meter_clip_hold, |
1280 | LANG_PM_CLIP_HOLD, 60, "peak meter clip hold", "eternal", | 1263 | LANG_PM_CLIP_HOLD, 60, "peak meter clip hold", "eternal", |
@@ -1297,7 +1280,6 @@ const struct settings_list settings[] = { | |||
1297 | OFFON_SETTING(0, peak_meter_clipcounter, LANG_PM_CLIPCOUNTER, false, | 1280 | OFFON_SETTING(0, peak_meter_clipcounter, LANG_PM_CLIPCOUNTER, false, |
1298 | "peak meter clipcounter", NULL), | 1281 | "peak meter clipcounter", NULL), |
1299 | #endif /* HAVE_RECORDING */ | 1282 | #endif /* HAVE_RECORDING */ |
1300 | #endif /* HAVE_LCD_BITMAP */ | ||
1301 | /* voice */ | 1283 | /* voice */ |
1302 | OFFON_SETTING(F_TEMPVAR, talk_menu, LANG_VOICE_MENU, true, "talk menu", NULL), | 1284 | OFFON_SETTING(F_TEMPVAR, talk_menu, LANG_VOICE_MENU, true, "talk menu", NULL), |
1303 | CHOICE_SETTING(0, talk_dir, LANG_VOICE_DIR, 0, | 1285 | CHOICE_SETTING(0, talk_dir, LANG_VOICE_DIR, 0, |
@@ -1755,7 +1737,6 @@ const struct settings_list settings[] = { | |||
1755 | #endif | 1737 | #endif |
1756 | CHOICE_SETTING(F_TEMPVAR, default_codepage, LANG_DEFAULT_CODEPAGE, 0, | 1738 | CHOICE_SETTING(F_TEMPVAR, default_codepage, LANG_DEFAULT_CODEPAGE, 0, |
1757 | "default codepage", | 1739 | "default codepage", |
1758 | #ifdef HAVE_LCD_BITMAP | ||
1759 | /* The order must match with that in unicode.c */ | 1740 | /* The order must match with that in unicode.c */ |
1760 | "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,cp1256," | 1741 | "iso8859-1,iso8859-7,iso8859-8,cp1251,iso8859-11,cp1256," |
1761 | "iso8859-9,iso8859-2,cp1250,cp1252,sjis,gb2312,ksx1001,big5,utf-8", | 1742 | "iso8859-9,iso8859-2,cp1250,cp1252,sjis,gb2312,ksx1001,big5,utf-8", |
@@ -1771,17 +1752,6 @@ const struct settings_list settings[] = { | |||
1771 | ID2P(LANG_CODEPAGE_JAPANESE), | 1752 | ID2P(LANG_CODEPAGE_JAPANESE), |
1772 | ID2P(LANG_CODEPAGE_SIMPLIFIED), ID2P(LANG_CODEPAGE_KOREAN), | 1753 | ID2P(LANG_CODEPAGE_SIMPLIFIED), ID2P(LANG_CODEPAGE_KOREAN), |
1773 | ID2P(LANG_CODEPAGE_TRADITIONAL), ID2P(LANG_CODEPAGE_UTF8)), | 1754 | ID2P(LANG_CODEPAGE_TRADITIONAL), ID2P(LANG_CODEPAGE_UTF8)), |
1774 | #else /* !HAVE_LCD_BITMAP */ | ||
1775 | /* The order must match with that in unicode.c */ | ||
1776 | "iso8859-1,iso8859-7,cp1251,iso8859-9,iso8859-2,cp1250,cp1252,utf-8", | ||
1777 | NULL, 8, | ||
1778 | ID2P(LANG_CODEPAGE_LATIN1), ID2P(LANG_CODEPAGE_GREEK), | ||
1779 | ID2P(LANG_CODEPAGE_CYRILLIC), ID2P(LANG_CODEPAGE_TURKISH), | ||
1780 | ID2P(LANG_CODEPAGE_LATIN_EXTENDED), | ||
1781 | ID2P(LANG_CODEPAGE_CENTRAL_EUROPEAN), | ||
1782 | ID2P(LANG_CODEPAGE_WESTERN_EUROPEAN), | ||
1783 | ID2P(LANG_CODEPAGE_UTF8)), | ||
1784 | #endif | ||
1785 | OFFON_SETTING(0, warnon_erase_dynplaylist, LANG_WARN_ERASEDYNPLAYLIST_MENU, | 1755 | OFFON_SETTING(0, warnon_erase_dynplaylist, LANG_WARN_ERASEDYNPLAYLIST_MENU, |
1786 | true, "warn when erasing dynamic playlist",NULL), | 1756 | true, "warn when erasing dynamic playlist",NULL), |
1787 | 1757 | ||
@@ -1805,12 +1775,10 @@ const struct settings_list settings[] = { | |||
1805 | 1775 | ||
1806 | OFFON_SETTING(0, hold_lr_for_scroll_in_list, -1, true, | 1776 | OFFON_SETTING(0, hold_lr_for_scroll_in_list, -1, true, |
1807 | "hold_lr_for_scroll_in_list",NULL), | 1777 | "hold_lr_for_scroll_in_list",NULL), |
1808 | #ifdef HAVE_LCD_BITMAP | ||
1809 | CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_CURRENT, | 1778 | CHOICE_SETTING(0, show_path_in_browser, LANG_SHOW_PATH, SHOW_PATH_CURRENT, |
1810 | "show path in browser", "off,current directory,full path", | 1779 | "show path in browser", "off,current directory,full path", |
1811 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), | 1780 | NULL, 3, ID2P(LANG_OFF), ID2P(LANG_SHOW_PATH_CURRENT), |
1812 | ID2P(LANG_DISPLAY_FULL_PATH)), | 1781 | ID2P(LANG_DISPLAY_FULL_PATH)), |
1813 | #endif | ||
1814 | 1782 | ||
1815 | #ifdef HAVE_AGC | 1783 | #ifdef HAVE_AGC |
1816 | {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORDING_AGC_PRESET, | 1784 | {F_T_INT,&global_settings.rec_agc_preset_mic,LANG_RECORDING_AGC_PRESET, |
@@ -1866,23 +1834,19 @@ const struct settings_list settings[] = { | |||
1866 | DEFAULT_FMS_NAME, SBS_DIR "/", ".rfms"), | 1834 | DEFAULT_FMS_NAME, SBS_DIR "/", ".rfms"), |
1867 | #endif | 1835 | #endif |
1868 | #endif /* CONFIG_TUNER */ | 1836 | #endif /* CONFIG_TUNER */ |
1869 | #ifdef HAVE_LCD_BITMAP | ||
1870 | TEXT_SETTING(F_THEMESETTING, font_file, "font", | 1837 | TEXT_SETTING(F_THEMESETTING, font_file, "font", |
1871 | DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"), | 1838 | DEFAULT_FONTNAME, FONT_DIR "/", ".fnt"), |
1872 | INT_SETTING(0, glyphs_to_cache, LANG_GLYPHS, DEFAULT_GLYPHS, | 1839 | INT_SETTING(0, glyphs_to_cache, LANG_GLYPHS, DEFAULT_GLYPHS, |
1873 | "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10, | 1840 | "glyphs", UNIT_INT, MIN_GLYPHS, MAX_GLYPHS, 10, |
1874 | NULL, NULL, NULL), | 1841 | NULL, NULL, NULL), |
1875 | #endif | ||
1876 | #ifdef HAVE_REMOTE_LCD | 1842 | #ifdef HAVE_REMOTE_LCD |
1877 | TEXT_SETTING(F_THEMESETTING, remote_font_file, "remote font", | 1843 | TEXT_SETTING(F_THEMESETTING, remote_font_file, "remote font", |
1878 | DEFAULT_REMOTE_FONTNAME, FONT_DIR "/", ".fnt"), | 1844 | DEFAULT_REMOTE_FONTNAME, FONT_DIR "/", ".fnt"), |
1879 | #endif | 1845 | #endif |
1880 | TEXT_SETTING(F_THEMESETTING,wps_file, "wps", | 1846 | TEXT_SETTING(F_THEMESETTING,wps_file, "wps", |
1881 | DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), | 1847 | DEFAULT_WPSNAME, WPS_DIR "/", ".wps"), |
1882 | #ifdef HAVE_LCD_BITMAP | ||
1883 | TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", | 1848 | TEXT_SETTING(F_THEMESETTING,sbs_file, "sbs", |
1884 | DEFAULT_SBSNAME, SBS_DIR "/", ".sbs"), | 1849 | DEFAULT_SBSNAME, SBS_DIR "/", ".sbs"), |
1885 | #endif | ||
1886 | #ifdef HAVE_REMOTE_LCD | 1850 | #ifdef HAVE_REMOTE_LCD |
1887 | TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", | 1851 | TEXT_SETTING(F_THEMESETTING,rwps_file,"rwps", |
1888 | DEFAULT_WPSNAME, WPS_DIR "/", ".rwps"), | 1852 | DEFAULT_WPSNAME, WPS_DIR "/", ".rwps"), |
@@ -1894,9 +1858,7 @@ const struct settings_list settings[] = { | |||
1894 | TEXT_SETTING(F_THEMESETTING,backdrop_file,"backdrop", | 1858 | TEXT_SETTING(F_THEMESETTING,backdrop_file,"backdrop", |
1895 | DEFAULT_BACKDROP, NULL, NULL), | 1859 | DEFAULT_BACKDROP, NULL, NULL), |
1896 | #endif | 1860 | #endif |
1897 | #ifdef HAVE_LCD_BITMAP | ||
1898 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), | 1861 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), |
1899 | #endif | ||
1900 | #ifdef HAVE_USB_CHARGING_ENABLE | 1862 | #ifdef HAVE_USB_CHARGING_ENABLE |
1901 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", | 1863 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", |
1902 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), | 1864 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), |
@@ -1965,13 +1927,11 @@ const struct settings_list settings[] = { | |||
1965 | #endif /* HAVE_RTC_ALARM */ | 1927 | #endif /* HAVE_RTC_ALARM */ |
1966 | 1928 | ||
1967 | /* Customizable icons */ | 1929 | /* Customizable icons */ |
1968 | #ifdef HAVE_LCD_BITMAP | ||
1969 | TEXT_SETTING(F_THEMESETTING, icon_file, "iconset", DEFAULT_ICONSET, | 1930 | TEXT_SETTING(F_THEMESETTING, icon_file, "iconset", DEFAULT_ICONSET, |
1970 | ICON_DIR "/", ".bmp"), | 1931 | ICON_DIR "/", ".bmp"), |
1971 | TEXT_SETTING(F_THEMESETTING, viewers_icon_file, "viewers iconset", | 1932 | TEXT_SETTING(F_THEMESETTING, viewers_icon_file, "viewers iconset", |
1972 | DEFAULT_VIEWERS_ICONSET, | 1933 | DEFAULT_VIEWERS_ICONSET, |
1973 | ICON_DIR "/", ".bmp"), | 1934 | ICON_DIR "/", ".bmp"), |
1974 | #endif | ||
1975 | #ifdef HAVE_REMOTE_LCD | 1935 | #ifdef HAVE_REMOTE_LCD |
1976 | TEXT_SETTING(F_THEMESETTING, remote_icon_file, "remote iconset", "-", | 1936 | TEXT_SETTING(F_THEMESETTING, remote_icon_file, "remote iconset", "-", |
1977 | ICON_DIR "/", ".bmp"), | 1937 | ICON_DIR "/", ".bmp"), |
@@ -2128,12 +2088,10 @@ const struct settings_list settings[] = { | |||
2128 | #endif | 2088 | #endif |
2129 | 2089 | ||
2130 | /* Customizable list */ | 2090 | /* Customizable list */ |
2131 | #ifdef HAVE_LCD_BITMAP | ||
2132 | VIEWPORT_SETTING(ui_vp_config, "ui viewport"), | 2091 | VIEWPORT_SETTING(ui_vp_config, "ui viewport"), |
2133 | #ifdef HAVE_REMOTE_LCD | 2092 | #ifdef HAVE_REMOTE_LCD |
2134 | VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"), | 2093 | VIEWPORT_SETTING(remote_ui_vp_config, "remote ui viewport"), |
2135 | #endif | 2094 | #endif |
2136 | #endif | ||
2137 | 2095 | ||
2138 | #ifdef HAVE_MORSE_INPUT | 2096 | #ifdef HAVE_MORSE_INPUT |
2139 | OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL), | 2097 | OFFON_SETTING(0, morse_input, LANG_MORSE_INPUT, false, "morse input", NULL), |