From 658026e6267277b27d297c481728f74d160a8481 Mon Sep 17 00:00:00 2001 From: Solomon Peachy 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/menus/display_menu.c | 20 -------------------- apps/menus/exported_menus.h | 2 -- apps/menus/recording_menu.c | 4 ---- apps/menus/settings_menu.c | 8 -------- apps/menus/theme_menu.c | 16 ---------------- 5 files changed, 50 deletions(-) (limited to 'apps/menus') diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c index b7a44a3bb7..b4a3d3eb63 100644 --- a/apps/menus/display_menu.c +++ b/apps/menus/display_menu.c @@ -30,9 +30,7 @@ #include "menu.h" #include "tree.h" #include "list.h" -#ifdef HAVE_LCD_BITMAP #include "peakmeter.h" -#endif #include "talk.h" #include "lcd.h" #ifdef HAVE_REMOTE_LCD @@ -187,16 +185,12 @@ MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL); #ifdef HAVE_LCD_CONTRAST MENUITEM_SETTING(contrast, &global_settings.contrast, NULL); #endif -#ifdef HAVE_LCD_BITMAP #ifdef HAVE_LCD_INVERT MENUITEM_SETTING(invert, &global_settings.invert, NULL); #endif #ifdef HAVE_LCD_FLIP MENUITEM_SETTING(flip_display, &global_settings.flip_display, flipdisplay_callback); #endif -#endif /* HAVE_LCD_BITMAP */ - - /* now the actual menu */ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), @@ -226,14 +220,12 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU), #ifdef HAVE_LCD_CONTRAST ,&contrast #endif -#ifdef HAVE_LCD_BITMAP # ifdef HAVE_LCD_INVERT ,&invert # endif # ifdef HAVE_LCD_FLIP ,&flip_display # endif -#endif /* HAVE_LCD_BITMAP */ ); /* LCD MENU */ /***********************************/ @@ -318,10 +310,8 @@ MAKE_MENU(lcd_remote_settings, ID2P(LANG_LCD_REMOTE_MENU), MENUITEM_SETTING_W_TEXT(scroll_speed, &global_settings.scroll_speed, ID2P(LANG_SCROLL), NULL); MENUITEM_SETTING(scroll_delay, &global_settings.scroll_delay, NULL); -#ifdef HAVE_LCD_BITMAP MENUITEM_SETTING_W_TEXT(scroll_step, &global_settings.scroll_step, ID2P(LANG_SCROLL_STEP_EXAMPLE), NULL); -#endif MENUITEM_SETTING(bidir_limit, &global_settings.bidir_limit, NULL); #ifdef HAVE_REMOTE_LCD MENUITEM_SETTING_W_TEXT(remote_scroll_speed, &global_settings.remote_scroll_speed, @@ -342,7 +332,6 @@ MENUITEM_SETTING(list_accel_start_delay, &global_settings.list_accel_start_delay, NULL); MENUITEM_SETTING(list_accel_wait, &global_settings.list_accel_wait, NULL); #endif /* HAVE_WHEEL_ACCELERATION */ -#ifdef HAVE_LCD_BITMAP static int screenscroll_callback(int action, const struct menu_item_ex *this_item, struct gui_synclist *this_list) @@ -360,21 +349,16 @@ static int screenscroll_callback(int action, MENUITEM_SETTING(offset_out_of_view, &global_settings.offset_out_of_view, screenscroll_callback); MENUITEM_SETTING(screen_scroll_step, &global_settings.screen_scroll_step, NULL); -#endif MENUITEM_SETTING(scroll_paginated, &global_settings.scroll_paginated, NULL); MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, &scroll_speed, &scroll_delay, -#ifdef HAVE_LCD_BITMAP &scroll_step, -#endif &bidir_limit, #ifdef HAVE_REMOTE_LCD &remote_scroll_sets, #endif -#ifdef HAVE_LCD_BITMAP &offset_out_of_view, &screen_scroll_step, -#endif &scroll_paginated, #ifndef HAVE_WHEEL_ACCELERATION &list_accel_start_delay, &list_accel_wait @@ -386,7 +370,6 @@ MAKE_MENU(scroll_settings_menu, ID2P(LANG_SCROLL_MENU), 0, Icon_NOICON, /***********************************/ /* PEAK METER MENU */ -#ifdef HAVE_LCD_BITMAP static int peakmeter_callback(int action, const struct menu_item_ex *this_item, struct gui_synclist *this_list) @@ -570,7 +553,6 @@ MAKE_MENU(peak_meter_menu, ID2P(LANG_PM_MENU), NULL, Icon_NOICON, &histogram, #endif &peak_meter_scale_item, &peak_meter_min_item, &peak_meter_max_item); -#endif /* HAVE_LCD_BITMAP */ /* PEAK METER MENU */ /***********************************/ @@ -645,9 +627,7 @@ MAKE_MENU(display_menu, ID2P(LANG_DISPLAY), &lcd_remote_settings, #endif &scroll_settings_menu, -#ifdef HAVE_LCD_BITMAP &peak_meter_menu, -#endif &codepage_setting, #ifdef HAVE_TOUCHSCREEN &touchscreen_menu, diff --git a/apps/menus/exported_menus.h b/apps/menus/exported_menus.h index efb6341155..93cabb0f2e 100644 --- a/apps/menus/exported_menus.h +++ b/apps/menus/exported_menus.h @@ -31,9 +31,7 @@ extern const struct menu_item_ex #ifdef HAVE_RECORDING recording_settings, /* recording_menu.c */ recording_settings_menu, -#ifdef HAVE_LCD_BITMAP peak_meter_menu, /* also used from within recording_menu */ -#endif #endif sound_settings, /* sound_menu.c */ settings_menu_item, /* settings_menu.c */ diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index c841de4e89..c3187afbef 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c @@ -32,10 +32,8 @@ #include "settings.h" #include "screens.h" #include "icons.h" -#ifdef HAVE_LCD_BITMAP #include "font.h" #include "scrollbar.h" -#endif #include "lang.h" #include "talk.h" #include "misc.h" @@ -601,9 +599,7 @@ MAKE_MENU(recording_settings_menu, ID2P(LANG_RECORDING_SETTINGS), #ifdef HAVE_AGC &agc_preset, &agc_cliptime, #endif -#ifdef HAVE_LCD_BITMAP &peak_meter_menu, -#endif &browse_recconfigs, &save_recpresets_item ); diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index e2b496a6f7..431600bbe1 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -187,9 +187,7 @@ MENUITEM_SETTING(interpret_numbers, &global_settings.interpret_numbers, fileview MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL); MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL); MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL); -#ifdef HAVE_LCD_BITMAP MENUITEM_SETTING(show_path_in_browser, &global_settings.show_path_in_browser, NULL); -#endif static int clear_start_directory(void) { strcpy(global_settings.start_directory, "/"); @@ -222,9 +220,7 @@ static int fileview_callback(int action, MAKE_MENU(file_menu, ID2P(LANG_FILE), 0, Icon_file_view_menu, &sort_case, &sort_dir, &sort_file, &interpret_numbers, &dirfilter, &show_filename_ext, &browse_current, -#ifdef HAVE_LCD_BITMAP &show_path_in_browser, -#endif &clear_start_directory_item ); /* FILE VIEW MENU */ @@ -312,14 +308,10 @@ MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON, /* Limits menu */ MENUITEM_SETTING(max_files_in_dir, &global_settings.max_files_in_dir, NULL); MENUITEM_SETTING(max_files_in_playlist, &global_settings.max_files_in_playlist, NULL); -#ifdef HAVE_LCD_BITMAP MENUITEM_SETTING(default_glyphs, &global_settings.glyphs_to_cache, NULL); -#endif MAKE_MENU(limits_menu, ID2P(LANG_LIMITS_MENU), 0, Icon_NOICON, &max_files_in_dir, &max_files_in_playlist -#ifdef HAVE_LCD_BITMAP ,&default_glyphs -#endif ); diff --git a/apps/menus/theme_menu.c b/apps/menus/theme_menu.c index 138a2f928a..a160d4c298 100644 --- a/apps/menus/theme_menu.c +++ b/apps/menus/theme_menu.c @@ -159,7 +159,6 @@ MAKE_MENU(colors_settings, ID2P(LANG_COLORS_MENU), /* */ -#ifdef HAVE_LCD_BITMAP static int statusbar_callback_ex(int action,const struct menu_item_ex *this_item, enum screen_type screen) { @@ -218,19 +217,16 @@ MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON, , &battery_display #endif ); -#endif /* HAVE_LCD_BITMAP */ /* */ /* BARS MENU */ /************************************/ -#ifdef HAVE_LCD_BITMAP static struct browse_folder_info fonts = {FONT_DIR, SHOW_FONT}; static struct browse_folder_info sbs = {SBS_DIR, SHOW_SBS}; #if CONFIG_TUNER static struct browse_folder_info fms = {WPS_DIR, SHOW_FMS}; #endif -#endif static struct browse_folder_info wps = {WPS_DIR, SHOW_WPS}; #ifdef HAVE_REMOTE_LCD static struct browse_folder_info rwps = {WPS_DIR, SHOW_RWPS}; @@ -268,7 +264,6 @@ int browse_folder(void *param) setting = global_settings.wps_file; lang_id = LANG_WHILE_PLAYING; break; -#ifdef HAVE_LCD_BITMAP case SHOW_FONT: ext = "fnt"; setting = global_settings.font_file; @@ -286,7 +281,6 @@ int browse_folder(void *param) lang_id = LANG_RADIOSCREEN; break; #endif /* CONFIG_TUNER */ -#endif #ifdef HAVE_REMOTE_LCD case SHOW_RWPS: ext = "rwps"; @@ -324,7 +318,6 @@ int browse_folder(void *param) return rockbox_browse(&browse); } -#ifdef HAVE_LCD_BITMAP MENUITEM_FUNCTION(browse_fonts, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_FONT), browse_folder, (void*)&fonts, NULL, Icon_Font); @@ -337,7 +330,6 @@ MENUITEM_FUNCTION(browse_fms, MENU_FUNC_USEPARAM, ID2P(LANG_RADIOSCREEN), browse_folder, (void*)&fms, NULL, Icon_Wps); #endif -#endif MENUITEM_FUNCTION(browse_wps, MENU_FUNC_USEPARAM, ID2P(LANG_WHILE_PLAYING), browse_folder, (void*)&wps, NULL, Icon_Wps); @@ -380,9 +372,7 @@ MENUITEM_SETTING(show_icons, &global_settings.show_icons, showicons_callback); MENUITEM_FUNCTION(browse_themes, MENU_FUNC_USEPARAM, ID2P(LANG_CUSTOM_THEME), browse_folder, (void*)&themes, NULL, Icon_Config); -#ifdef HAVE_LCD_BITMAP MENUITEM_SETTING(cursor_style, &global_settings.cursor_style, NULL); -#endif #if LCD_DEPTH > 1 MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); #endif @@ -390,9 +380,7 @@ MENUITEM_SETTING(sep_menu, &global_settings.list_separator_height, NULL); MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), NULL, Icon_Wps, &browse_themes, -#ifdef HAVE_LCD_BITMAP &browse_fonts, -#endif &browse_wps, #ifdef HAVE_REMOTE_LCD &browse_rwps, @@ -403,9 +391,7 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), &browse_rfms, #endif #endif -#ifdef HAVE_LCD_BITMAP &browse_sbs, -#endif #ifdef HAVE_REMOTE_LCD &browse_rsbs, #endif @@ -413,7 +399,6 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), #ifdef HAVE_BACKDROP_IMAGE &clear_main_bd, #endif -#ifdef HAVE_LCD_BITMAP &bars_menu, &cursor_style, #if LCD_DEPTH > 1 @@ -422,5 +407,4 @@ MAKE_MENU(theme_menu, ID2P(LANG_THEME_MENU), #ifdef HAVE_LCD_COLOR &colors_settings, #endif -#endif /* HAVE_LCD_BITMAP */ ); -- cgit v1.2.3