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.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.c')
-rw-r--r-- | apps/settings.c | 21 |
1 files changed, 0 insertions, 21 deletions
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 @@ | |||
47 | #include "system.h" | 47 | #include "system.h" |
48 | #include "general.h" | 48 | #include "general.h" |
49 | #include "misc.h" | 49 | #include "misc.h" |
50 | #ifdef HAVE_LCD_BITMAP | ||
51 | #include "icons.h" | 50 | #include "icons.h" |
52 | #include "font.h" | 51 | #include "font.h" |
53 | #include "peakmeter.h" | 52 | #include "peakmeter.h" |
54 | #endif | ||
55 | #include "lang.h" | 53 | #include "lang.h" |
56 | #include "language.h" | 54 | #include "language.h" |
57 | #include "powermgmt.h" | 55 | #include "powermgmt.h" |
@@ -91,11 +89,7 @@ struct system_status global_status; | |||
91 | #define NVRAM_BLOCK_SIZE (sizeof(struct system_status) + NVRAM_DATA_START) | 89 | #define NVRAM_BLOCK_SIZE (sizeof(struct system_status) + NVRAM_DATA_START) |
92 | #endif | 90 | #endif |
93 | 91 | ||
94 | #ifdef HAVE_LCD_BITMAP | ||
95 | #define MAX_LINES 10 | 92 | #define MAX_LINES 10 |
96 | #else | ||
97 | #define MAX_LINES 2 | ||
98 | #endif | ||
99 | 93 | ||
100 | #ifdef HAVE_REMOTE_LCD | 94 | #ifdef HAVE_REMOTE_LCD |
101 | #include "lcd-remote.h" | 95 | #include "lcd-remote.h" |
@@ -706,8 +700,6 @@ bool settings_save_config(int options) | |||
706 | 700 | ||
707 | /** Apply and Reset settings **/ | 701 | /** Apply and Reset settings **/ |
708 | 702 | ||
709 | |||
710 | #ifdef HAVE_LCD_BITMAP | ||
711 | /* | 703 | /* |
712 | * Applies the range infos stored in global_settings to | 704 | * Applies the range infos stored in global_settings to |
713 | * the peak meter. | 705 | * the peak meter. |
@@ -734,7 +726,6 @@ void settings_apply_pm_range(void) | |||
734 | /* apply the range */ | 726 | /* apply the range */ |
735 | peak_meter_init_range(global_settings.peak_meter_dbfs, pm_min, pm_max); | 727 | peak_meter_init_range(global_settings.peak_meter_dbfs, pm_min, pm_max); |
736 | } | 728 | } |
737 | #endif /* HAVE_LCD_BITMAP */ | ||
738 | 729 | ||
739 | void sound_settings_apply(void) | 730 | void sound_settings_apply(void) |
740 | { | 731 | { |
@@ -786,9 +777,7 @@ void sound_settings_apply(void) | |||
786 | 777 | ||
787 | void settings_apply(bool read_disk) | 778 | void settings_apply(bool read_disk) |
788 | { | 779 | { |
789 | #ifdef HAVE_LCD_BITMAP | ||
790 | int rc; | 780 | int rc; |
791 | #endif | ||
792 | CHART(">set_codepage"); | 781 | CHART(">set_codepage"); |
793 | set_codepage(global_settings.default_codepage); | 782 | set_codepage(global_settings.default_codepage); |
794 | CHART("<set_codepage"); | 783 | CHART("<set_codepage"); |
@@ -864,7 +853,6 @@ void settings_apply(bool read_disk) | |||
864 | set_battery_type(global_settings.battery_type); | 853 | set_battery_type(global_settings.battery_type); |
865 | #endif | 854 | #endif |
866 | 855 | ||
867 | #ifdef HAVE_LCD_BITMAP | ||
868 | #ifdef HAVE_LCD_INVERT | 856 | #ifdef HAVE_LCD_INVERT |
869 | lcd_set_invert_display(global_settings.invert); | 857 | lcd_set_invert_display(global_settings.invert); |
870 | #endif | 858 | #endif |
@@ -877,7 +865,6 @@ void settings_apply(bool read_disk) | |||
877 | peak_meter_init_times( | 865 | peak_meter_init_times( |
878 | global_settings.peak_meter_release, global_settings.peak_meter_hold, | 866 | global_settings.peak_meter_release, global_settings.peak_meter_hold, |
879 | global_settings.peak_meter_clip_hold); | 867 | global_settings.peak_meter_clip_hold); |
880 | #endif | ||
881 | 868 | ||
882 | #ifdef HAVE_SPEAKER | 869 | #ifdef HAVE_SPEAKER |
883 | audio_enable_speaker(global_settings.speaker_mode); | 870 | audio_enable_speaker(global_settings.speaker_mode); |
@@ -886,7 +873,6 @@ void settings_apply(bool read_disk) | |||
886 | if (read_disk) | 873 | if (read_disk) |
887 | { | 874 | { |
888 | char buf[MAX_PATH]; | 875 | char buf[MAX_PATH]; |
889 | #ifdef HAVE_LCD_BITMAP | ||
890 | /* fonts need to be loaded before the WPS */ | 876 | /* fonts need to be loaded before the WPS */ |
891 | if (global_settings.font_file[0] | 877 | if (global_settings.font_file[0] |
892 | && global_settings.font_file[0] != '-') { | 878 | && global_settings.font_file[0] != '-') { |
@@ -935,7 +921,6 @@ void settings_apply(bool read_disk) | |||
935 | } | 921 | } |
936 | else | 922 | else |
937 | load_kbd(NULL); | 923 | load_kbd(NULL); |
938 | #endif /* HAVE_LCD_BITMAP */ | ||
939 | if ( global_settings.lang_file[0]) { | 924 | if ( global_settings.lang_file[0]) { |
940 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", | 925 | snprintf(buf, sizeof buf, LANG_DIR "/%s.lng", |
941 | global_settings.lang_file); | 926 | global_settings.lang_file); |
@@ -967,11 +952,9 @@ void settings_apply(bool read_disk) | |||
967 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); | 952 | screens[SCREEN_MAIN].set_background(global_settings.bg_color); |
968 | #endif | 953 | #endif |
969 | 954 | ||
970 | #ifdef HAVE_LCD_BITMAP | ||
971 | lcd_scroll_step(global_settings.scroll_step); | 955 | lcd_scroll_step(global_settings.scroll_step); |
972 | gui_list_screen_scroll_step(global_settings.screen_scroll_step); | 956 | gui_list_screen_scroll_step(global_settings.screen_scroll_step); |
973 | gui_list_screen_scroll_out_of_view(global_settings.offset_out_of_view); | 957 | gui_list_screen_scroll_out_of_view(global_settings.offset_out_of_view); |
974 | #endif | ||
975 | lcd_bidir_scroll(global_settings.bidir_limit); | 958 | lcd_bidir_scroll(global_settings.bidir_limit); |
976 | lcd_scroll_delay(global_settings.scroll_delay); | 959 | lcd_scroll_delay(global_settings.scroll_delay); |
977 | 960 | ||
@@ -1063,12 +1046,10 @@ void settings_apply(bool read_disk) | |||
1063 | #if defined(HAVE_RECORDING) | 1046 | #if defined(HAVE_RECORDING) |
1064 | enc_global_settings_apply(); | 1047 | enc_global_settings_apply(); |
1065 | #endif | 1048 | #endif |
1066 | #ifdef HAVE_LCD_BITMAP | ||
1067 | /* already called with THEME_STATUSBAR in settings_apply_skins() */ | 1049 | /* already called with THEME_STATUSBAR in settings_apply_skins() */ |
1068 | CHART(">viewportmanager_theme_changed"); | 1050 | CHART(">viewportmanager_theme_changed"); |
1069 | viewportmanager_theme_changed(THEME_UI_VIEWPORT|THEME_LANGUAGE|THEME_BUTTONBAR); | 1051 | viewportmanager_theme_changed(THEME_UI_VIEWPORT|THEME_LANGUAGE|THEME_BUTTONBAR); |
1070 | CHART("<viewportmanager_theme_changed"); | 1052 | CHART("<viewportmanager_theme_changed"); |
1071 | #endif | ||
1072 | } | 1053 | } |
1073 | 1054 | ||
1074 | 1055 | ||
@@ -1109,7 +1090,6 @@ void settings_reset(void) | |||
1109 | #if defined (HAVE_RECORDING) | 1090 | #if defined (HAVE_RECORDING) |
1110 | enc_global_settings_reset(); | 1091 | enc_global_settings_reset(); |
1111 | #endif | 1092 | #endif |
1112 | #ifdef HAVE_LCD_BITMAP | ||
1113 | FOR_NB_SCREENS(i) | 1093 | FOR_NB_SCREENS(i) |
1114 | { | 1094 | { |
1115 | if (screens[i].getuifont() > FONT_SYSFIXED) | 1095 | if (screens[i].getuifont() > FONT_SYSFIXED) |
@@ -1119,7 +1099,6 @@ void settings_reset(void) | |||
1119 | screens[i].setfont(FONT_SYSFIXED); | 1099 | screens[i].setfont(FONT_SYSFIXED); |
1120 | } | 1100 | } |
1121 | } | 1101 | } |
1122 | #endif | ||
1123 | } | 1102 | } |
1124 | 1103 | ||
1125 | /** Changing setting values **/ | 1104 | /** Changing setting values **/ |