From 14d2a619526078f104e4eb85bfdc03206de0803f Mon Sep 17 00:00:00 2001 From: zoltanvb <101990835+zoltanvb@users.noreply.github.com> Date: Tue, 9 Jan 2024 09:17:47 +0100 Subject: [PATCH] Removal of thumbnail pack downloader related options (#16096) Thumbnail packs are no longer available, but the option was still present as "legacy thumbnail downloader". Since it serves no purpose any more, it is removed from the code. --- config.def.h | 4 +++- configuration.c | 3 +++ configuration.h | 3 +++ intl/msg_hash_lbl.h | 7 +++++++ menu/cbs/menu_cbs_deferred_push.c | 9 +++++++++ menu/cbs/menu_cbs_ok.c | 18 ++++++++++++++++++ menu/cbs/menu_cbs_sublabel.c | 12 ++++++++++++ menu/cbs/menu_cbs_title.c | 9 +++++++++ menu/drivers/materialui.c | 3 +++ menu/drivers/ozone.c | 3 +++ menu/drivers/xmb.c | 3 +++ menu/menu_cbs.h | 3 +++ menu/menu_displaylist.c | 14 ++++++++++++-- menu/menu_displaylist.h | 3 +++ menu/menu_setting.c | 3 +++ msg_hash.h | 10 ++++++++-- 16 files changed, 102 insertions(+), 5 deletions(-) diff --git a/config.def.h b/config.def.h index 25f0dbe4634e..73d09d3b6b3e 100644 --- a/config.def.h +++ b/config.def.h @@ -699,8 +699,10 @@ #ifdef HAVE_MIST #define DEFAULT_MENU_SHOW_CORE_MANAGER_STEAM true #endif +#if 0 +/* Thumbnailpack removal */ #define DEFAULT_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER false - +#endif #define DEFAULT_MENU_SHOW_SUBLABELS true #define DEFAULT_MENU_DYNAMIC_WALLPAPER_ENABLE true #define DEFAULT_MENU_SCROLL_FAST false diff --git a/configuration.c b/configuration.c index 25ed1671c583..01f3229baf76 100644 --- a/configuration.c +++ b/configuration.c @@ -1975,7 +1975,10 @@ static struct config_bool_setting *populate_settings_bool( SETTING_BOOL("menu_show_shutdown", &settings->bools.menu_show_shutdown, true, DEFAULT_MENU_SHOW_SHUTDOWN, false); SETTING_BOOL("menu_show_online_updater", &settings->bools.menu_show_online_updater, true, DEFAULT_MENU_SHOW_ONLINE_UPDATER, false); SETTING_BOOL("menu_show_core_updater", &settings->bools.menu_show_core_updater, true, DEFAULT_MENU_SHOW_CORE_UPDATER, false); +#if 0 +/* Thumbnailpack removal */ SETTING_BOOL("menu_show_legacy_thumbnail_updater", &settings->bools.menu_show_legacy_thumbnail_updater, true, DEFAULT_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, false); +#endif #ifdef HAVE_MIST SETTING_BOOL("menu_show_core_manager_steam", &settings->bools.menu_show_core_manager_steam, true, DEFAULT_MENU_SHOW_CORE_MANAGER_STEAM, false); #endif diff --git a/configuration.h b/configuration.h index 323cca1bdbe2..2a60eff8bae5 100644 --- a/configuration.h +++ b/configuration.h @@ -749,7 +749,10 @@ typedef struct settings bool menu_show_latency; bool menu_show_rewind; bool menu_show_overlays; +#if 0 +/* Thumbnailpack removal */ bool menu_show_legacy_thumbnail_updater; +#endif bool menu_materialui_icons_enable; bool menu_materialui_playlist_icons_enable; bool menu_materialui_switch_icons; diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index 99925168b436..09b03c3cc348 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -499,6 +499,8 @@ MSG_HASH( MENU_ENUM_LABEL_CB_MENU_WALLPAPER, "cb_menu_wallpaper" ) +#if 0 +/* Thumbnailpack removal */ MSG_HASH( MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD, "cb_thumbnails_updater_download" @@ -507,6 +509,7 @@ MSG_HASH( MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST, "cb_thumbnails_updater_list" ) +#endif MSG_HASH( MENU_ENUM_LABEL_CB_UPDATE_ASSETS, "cb_update_assets" @@ -1415,10 +1418,13 @@ MSG_HASH( MENU_ENUM_LABEL_DEFERRED_CLOUD_SYNC_SETTINGS_LIST, "deferred_cloud_sync_settings_list" ) +#if 0 +/* Thumbnailpack removal */ MSG_HASH( MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST, "deferred_thumbnails_updater_list" ) +#endif MSG_HASH( MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST, "deferred_pl_thumbnails_updater_list" @@ -3822,6 +3828,7 @@ MSG_HASH( MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY, "thumbnails_directory" ) +/* Thumbnailpack removal - next entry is deprecated */ MSG_HASH( MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, "thumbnails_updater_list" diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index 61ab82bd8901..426205b5722c 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -255,7 +255,10 @@ GENERIC_DEFERRED_PUSH(deferred_push_menu_sounds_list, DISPLAYLIST_ GENERIC_DEFERRED_PUSH(deferred_push_rgui_theme_preset, DISPLAYLIST_RGUI_THEME_PRESETS) #ifdef HAVE_NETWORKING +#if 0 +/* Thumbnailpack removal */ GENERIC_DEFERRED_PUSH(deferred_push_thumbnails_updater_list, DISPLAYLIST_THUMBNAILS_UPDATER) +#endif GENERIC_DEFERRED_PUSH(deferred_push_pl_thumbnails_updater_list, DISPLAYLIST_PL_THUMBNAILS_UPDATER) GENERIC_DEFERRED_PUSH(deferred_push_core_updater_list, DISPLAYLIST_CORES_UPDATER) GENERIC_DEFERRED_PUSH(deferred_push_core_content_list, DISPLAYLIST_CORE_CONTENT) @@ -769,7 +772,10 @@ static int menu_cbs_init_bind_deferred_push_compare_label( {MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_LIST, deferred_push_core_content_dirs_list}, {MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_SUBDIR_LIST, deferred_push_core_content_dirs_subdir_list}, {MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST, deferred_push_core_updater_list}, +#if 0 +/* Thumbnailpack removal */ {MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST, deferred_push_thumbnails_updater_list}, +#endif {MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST, deferred_push_pl_thumbnails_updater_list}, {MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST, deferred_push_core_content_list}, {MENU_ENUM_LABEL_DEFERRED_CORE_SYSTEM_FILES_LIST, deferred_push_core_system_files_list}, @@ -1022,11 +1028,14 @@ static int menu_cbs_init_bind_deferred_push_compare_label( BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_core_system_files_list); #endif break; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST: #ifdef HAVE_NETWORKING BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_thumbnails_updater_list); #endif break; +#endif case MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST: #ifdef HAVE_NETWORKING BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_pl_thumbnails_updater_list); diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index 52978d093b1f..2cbad234715c 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -1527,6 +1527,8 @@ int generic_action_ok_displaylist_push( info.enum_idx = MENU_ENUM_LABEL_DEFERRED_CORE_UPDATER_LIST; dl_type = DISPLAYLIST_PENDING_CLEAR; break; +#if 0 +/* Thumbnailpack removal */ case ACTION_OK_DL_THUMBNAILS_UPDATER_LIST: info.type = type; info.directory_ptr = idx; @@ -1536,6 +1538,7 @@ int generic_action_ok_displaylist_push( info.enum_idx = MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST; dl_type = DISPLAYLIST_PENDING_CLEAR; break; +#endif case ACTION_OK_DL_PL_THUMBNAILS_UPDATER_LIST: info.type = type; info.directory_ptr = idx; @@ -4971,6 +4974,8 @@ static int generic_action_ok_network(const char *path, callback = cb_net_generic; suppress_msg = true; break; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST: fill_pathname_join_special(url_path, FILE_PATH_CORE_THUMBNAILPACKS_URL, @@ -4979,6 +4984,7 @@ static int generic_action_ok_network(const char *path, type_id2 = ACTION_OK_DL_THUMBNAILS_UPDATER_LIST; callback = cb_net_generic; break; +#endif #ifdef HAVE_LAKKA case MENU_ENUM_LABEL_CB_LAKKA_LIST: /* TODO unhardcode this path */ @@ -5017,7 +5023,10 @@ static int generic_action_ok_network(const char *path, DEFAULT_ACTION_OK_LIST(action_ok_core_content_list, MENU_ENUM_LABEL_CB_CORE_CONTENT_LIST) DEFAULT_ACTION_OK_LIST(action_ok_core_content_dirs_list, MENU_ENUM_LABEL_CB_CORE_CONTENT_DIRS_LIST) DEFAULT_ACTION_OK_LIST(action_ok_core_system_files_list, MENU_ENUM_LABEL_CB_CORE_SYSTEM_FILES_LIST) +#if 0 +/* Thumbnailpack removal */ DEFAULT_ACTION_OK_LIST(action_ok_thumbnails_updater_list, MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST) +#endif DEFAULT_ACTION_OK_LIST(action_ok_lakka_list, MENU_ENUM_LABEL_CB_LAKKA_LIST) static void cb_generic_dir_download(retro_task_t *task, @@ -5449,7 +5458,10 @@ static int action_ok_sideload_core(const char *path, #ifdef HAVE_NETWORKING DEFAULT_ACTION_OK_DOWNLOAD(action_ok_core_system_files_download, MENU_ENUM_LABEL_CB_CORE_SYSTEM_FILES_DOWNLOAD) DEFAULT_ACTION_OK_DOWNLOAD(action_ok_core_content_thumbnails, MENU_ENUM_LABEL_CB_CORE_THUMBNAILS_DOWNLOAD) +#if 0 +/* Thumbnailpack removal */ DEFAULT_ACTION_OK_DOWNLOAD(action_ok_thumbnails_updater_download, MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD) +#endif DEFAULT_ACTION_OK_DOWNLOAD(action_ok_download_url, MENU_ENUM_LABEL_CB_DOWNLOAD_URL) #ifdef HAVE_LAKKA DEFAULT_ACTION_OK_DOWNLOAD(action_ok_lakka_download, MENU_ENUM_LABEL_CB_LAKKA_DOWNLOAD) @@ -8465,7 +8477,10 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, #if defined(ANDROID) {MENU_ENUM_LABEL_SWITCH_INSTALLED_CORES_PFD, action_ok_switch_installed_cores_pfd}, #endif +#if 0 +/* Thumbnailpack removal */ {MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST, action_ok_thumbnails_updater_list}, +#endif {MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST, action_ok_pl_thumbnails_updater_list}, {MENU_ENUM_LABEL_DOWNLOAD_PL_ENTRY_THUMBNAILS, action_ok_pl_entry_content_thumbnails}, {MENU_ENUM_LABEL_UPDATE_LAKKA, action_ok_lakka_list}, @@ -9193,8 +9208,11 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs, #endif break; case FILE_TYPE_DOWNLOAD_THUMBNAIL: +#if 0 +/* Thumbnailpack removal */ #ifdef HAVE_NETWORKING BIND_ACTION_OK(cbs, action_ok_thumbnails_updater_download); +#endif #endif break; case FILE_TYPE_DOWNLOAD_LAKKA: diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c index c4855453a560..ca64ff8232c6 100644 --- a/menu/cbs/menu_cbs_sublabel.c +++ b/menu/cbs/menu_cbs_sublabel.c @@ -1118,7 +1118,10 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_reboot, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_shutdown, MENU_ENUM_SUBLABEL_MENU_SHOW_SHUTDOWN) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_online_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_core_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER) +#if 0 +/* Thumbnailpack removal */ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_show_legacy_thumbnail_updater, MENU_ENUM_SUBLABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER) +#endif DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_scroll_fast, MENU_ENUM_SUBLABEL_MENU_SCROLL_FAST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_scroll_delay, MENU_ENUM_SUBLABEL_MENU_SCROLL_DELAY) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_music_tab, MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC) @@ -1308,7 +1311,10 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_playlist_use_filename, DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_full_width_layout, MENU_ENUM_SUBLABEL_MENU_RGUI_FULL_WIDTH_LAYOUT) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_extended_ascii, MENU_ENUM_SUBLABEL_MENU_RGUI_EXTENDED_ASCII) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_menu_rgui_switch_icons, MENU_ENUM_SUBLABEL_MENU_RGUI_SWITCH_ICONS) +#if 0 +/* Thumbnailpack removal */ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_thumbnails_updater_list, MENU_ENUM_SUBLABEL_THUMBNAILS_UPDATER_LIST) +#endif DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_pl_thumbnails_updater_list, MENU_ENUM_SUBLABEL_PL_THUMBNAILS_UPDATER_LIST) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_system_files, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_SYSTEM_FILES) DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_download_core_content, MENU_ENUM_SUBLABEL_DOWNLOAD_CORE_CONTENT) @@ -3017,9 +3023,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_core_updater); break; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_show_legacy_thumbnail_updater); break; +#endif case MENU_ENUM_LABEL_MENU_SCROLL_FAST: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_scroll_fast); break; @@ -5437,9 +5446,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_MENU_RGUI_SWITCH_ICONS: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_rgui_switch_icons); break; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_thumbnails_updater_list); break; +#endif case MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST: BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_pl_thumbnails_updater_list); break; diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index ac4d526cdb63..c8bac43eae7c 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -588,7 +588,10 @@ DEFAULT_TITLE_MACRO(action_get_user_accounts_list, MENU_ENUM_LABEL_ DEFAULT_TITLE_MACRO(action_get_core_list, MENU_ENUM_LABEL_VALUE_CORE_LIST) DEFAULT_TITLE_MACRO(action_get_online_updater_list, MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER) DEFAULT_TITLE_MACRO(action_get_netplay_list, MENU_ENUM_LABEL_VALUE_NETPLAY) +#if 0 +/* Thumbnailpack removal */ DEFAULT_TITLE_MACRO(action_get_online_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST) +#endif DEFAULT_TITLE_MACRO(action_get_online_pl_thumbnails_updater_list, MENU_ENUM_LABEL_VALUE_PL_THUMBNAILS_UPDATER_LIST) DEFAULT_TITLE_MACRO(action_get_add_content_list, MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST) DEFAULT_TITLE_MACRO(action_get_configurations_list, MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST) @@ -1228,8 +1231,11 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, action_get_frontend_counters_list}, {MENU_ENUM_LABEL_CORE_COUNTERS, action_get_core_counters_list}, +#if 0 +/* Thumbnailpack removal */ {MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST, action_get_online_thumbnails_updater_list}, +#endif {MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST, action_get_online_pl_thumbnails_updater_list}, {MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST, @@ -1514,9 +1520,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_NETPLAY: BIND_ACTION_GET_TITLE(cbs, action_get_netplay_list); break; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_online_thumbnails_updater_list); break; +#endif case MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_online_pl_thumbnails_updater_list); break; diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index cc3694dccbbc..2c321b6fcb63 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -10932,7 +10932,10 @@ static void materialui_list_insert( || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_FRAME_TIME_COUNTER_SETTINGS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CORE_UPDATER_LIST)) +#if 0 +/* Thumbnailpack removal */ || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST)) +#endif || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_UPDATER_SETTINGS)) || string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOAD_CORE_CONTENT_DIRS)) diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c index 6e46c31c0dfe..31a35d84a2c3 100644 --- a/menu/drivers/ozone.c +++ b/menu/drivers/ozone.c @@ -1884,7 +1884,10 @@ static uintptr_t ozone_entries_icon_get_texture( return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MAIN_MENU]; case MENU_ENUM_LABEL_UPDATE_CHEATS: return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS]; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST: +#endif case MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST: case MENU_ENUM_LABEL_DOWNLOAD_PL_ENTRY_THUMBNAILS: case MENU_ENUM_LABEL_QUICK_MENU_SHOW_DOWNLOAD_THUMBNAILS: diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 816dbf0bc574..0faff1b77372 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -3072,7 +3072,10 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb, case MENU_ENUM_LABEL_UPDATE_CHEATS: case MENU_ENUM_LABEL_QUICK_MENU_SHOW_CHEATS: return xmb->textures.list[XMB_TEXTURE_CHEAT_OPTIONS]; +#if 0 +/* Thumbnailpack removal */ case MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST: +#endif case MENU_ENUM_LABEL_PL_THUMBNAILS_UPDATER_LIST: case MENU_ENUM_LABEL_DOWNLOAD_PL_ENTRY_THUMBNAILS: case MENU_ENUM_LABEL_QUICK_MENU_SHOW_DOWNLOAD_THUMBNAILS: diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 9191f48d4488..7828e987a63d 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -171,7 +171,10 @@ enum ACTION_OK_DL_STEAM_SETTINGS_LIST, ACTION_OK_DL_CORE_MANAGER_STEAM_LIST, #endif +#if 0 +/* Thumbnailpack removal */ ACTION_OK_DL_THUMBNAILS_UPDATER_LIST, +#endif ACTION_OK_DL_PL_THUMBNAILS_UPDATER_LIST, ACTION_OK_DL_BROWSE_URL_LIST, ACTION_OK_DL_CORE_CONTENT_LIST, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 608fd4299c81..6f5b23332c1c 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -9579,8 +9579,11 @@ unsigned menu_displaylist_build_list( #ifdef HAVE_ONLINE_UPDATER {MENU_ENUM_LABEL_MENU_SHOW_ONLINE_UPDATER, PARSE_ONLY_BOOL, true }, {MENU_ENUM_LABEL_MENU_SHOW_CORE_UPDATER, PARSE_ONLY_BOOL, true }, +#if 0 +/* Thumbnailpack removal */ {MENU_ENUM_LABEL_MENU_SHOW_LEGACY_THUMBNAIL_UPDATER, PARSE_ONLY_BOOL, true }, #endif +#endif #ifdef HAVE_MIST {MENU_ENUM_LABEL_MENU_SHOW_CORE_MANAGER_STEAM, PARSE_ONLY_BOOL, true }, #endif @@ -12784,6 +12787,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, info->flags |= MD_FLAG_NEED_REFRESH | MD_FLAG_NEED_PUSH; break; +#if 0 +/* Thumbnailpack removal */ case DISPLAYLIST_THUMBNAILS_UPDATER: menu_entries_clear(info->list); #ifdef HAVE_NETWORKING @@ -12803,6 +12808,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, | MD_FLAG_NEED_CLEAR; #endif break; +#endif case DISPLAYLIST_PL_THUMBNAILS_UPDATER: menu_entries_clear(info->list); #ifdef HAVE_NETWORKING @@ -13975,6 +13981,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTING_ACTION, 0, 0, NULL)) count++; +#if 0 +/* Thumbnailpack removal */ if (settings->bools.menu_show_legacy_thumbnail_updater) { if (menu_entries_append(info->list, @@ -13984,7 +13992,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTING_ACTION, 0, 0, NULL)) count++; } - +#endif #elif defined(HAVE_NETWORKING) #ifdef HAVE_UPDATE_CORES if (settings->bools.menu_show_core_updater) @@ -14059,6 +14067,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTING_ACTION, 0, 0, NULL)) count++; +#if 0 +/* Thumbnailpack removal */ if (settings->bools.menu_show_legacy_thumbnail_updater) { if (menu_entries_append(info->list, @@ -14068,7 +14078,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, MENU_SETTING_ACTION, 0, 0, NULL)) count++; } - +#endif #ifdef HAVE_NETWORKING if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(info->list, MENU_ENUM_LABEL_NETWORK_ON_DEMAND_THUMBNAILS, diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index fadc5f657d38..3269926ff806 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -120,7 +120,10 @@ enum menu_displaylist_ctl_state DISPLAYLIST_CORE_MANAGER_STEAM_LIST, DISPLAYLIST_CORE_INFORMATION_STEAM_LIST, #endif +#if 0 +/* Thumbnailpack removal */ DISPLAYLIST_THUMBNAILS_UPDATER, +#endif DISPLAYLIST_PL_THUMBNAILS_UPDATER, DISPLAYLIST_LAKKA, DISPLAYLIST_CORES_DETECTED, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3cd43db99423..97a814139056 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -19793,6 +19793,8 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); #endif +#if 0 +/* Thumbnailpack removal */ CONFIG_BOOL( list, list_info, &settings->bools.menu_show_legacy_thumbnail_updater, @@ -19808,6 +19810,7 @@ static bool setting_append_list( general_read_handler, SD_FLAG_NONE); #endif +#endif #ifdef HAVE_MIST CONFIG_BOOL( diff --git a/msg_hash.h b/msg_hash.h index d0108c20d272..e566d0260499 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -1456,7 +1456,7 @@ enum msg_hash_enums MENU_LABEL(MENU_SHOW_SHUTDOWN), MENU_LABEL(MENU_SHOW_ONLINE_UPDATER), MENU_LABEL(MENU_SHOW_CORE_UPDATER), - MENU_LABEL(MENU_SHOW_LEGACY_THUMBNAIL_UPDATER), + MENU_LABEL(MENU_SHOW_LEGACY_THUMBNAIL_UPDATER), /* Thumbnailpack removal - deprecated*/ MENU_LABEL(MENU_SCROLL_FAST), MENU_LABEL(MENU_SCROLL_DELAY), MENU_LABEL(MENU_ENABLE_KIOSK_MODE), @@ -1757,7 +1757,7 @@ enum msg_hash_enums #ifdef _3DS MENU_LABEL(MENU_BOTTOM_SETTINGS), #endif - MENU_LABEL(THUMBNAILS_UPDATER_LIST), + MENU_LABEL(THUMBNAILS_UPDATER_LIST), /* Thumbnailpack removal - deprecated*/ MENU_LABEL(PL_THUMBNAILS_UPDATER_LIST), MENU_LABEL(PL_THUMBNAILS_UPDATER_ENTRY), MENU_LABEL(USER_INTERFACE_SETTINGS), @@ -1957,7 +1957,10 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_STEAM_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_CORE_MANAGER_STEAM_LIST, #endif +#if 0 +/* Thumbnailpack removal */ MENU_ENUM_LABEL_DEFERRED_THUMBNAILS_UPDATER_LIST, +#endif MENU_ENUM_LABEL_DEFERRED_PL_THUMBNAILS_UPDATER_LIST, MENU_ENUM_LABEL_DEFERRED_RECORDING_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST, @@ -3638,8 +3641,11 @@ enum msg_hash_enums MENU_ENUM_LABEL_CB_MENU_SAVESTATE_THUMBNAIL, MENU_ENUM_LABEL_CB_MENU_WALLPAPER, MENU_ENUM_LABEL_CB_PL_THUMBNAILS_DOWNLOAD, +#if 0 +/* Thumbnailpack removal */ MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_DOWNLOAD, MENU_ENUM_LABEL_CB_THUMBNAILS_UPDATER_LIST, +#endif MENU_ENUM_LABEL_CB_UPDATE_ASSETS, MENU_ENUM_LABEL_CB_UPDATE_AUTOCONFIG_PROFILES, MENU_ENUM_LABEL_CB_UPDATE_CHEATS,