diff --git a/menu/intl/menu_hash_us.c b/menu/intl/menu_hash_us.c index f58f755653..80e199366c 100644 --- a/menu/intl/menu_hash_us.c +++ b/menu/intl/menu_hash_us.c @@ -1636,6 +1636,8 @@ const char *menu_hash_to_str_us(uint32_t hash) return "Updater"; case MENU_LABEL_VALUE_NETWORK_SETTINGS: return "Network"; + case MENU_LABEL_VALUE_LAKKA_SERVICES: + return "Lakka Services"; case MENU_LABEL_VALUE_PLAYLIST_SETTINGS: return "Playlists"; case MENU_LABEL_VALUE_USER_SETTINGS: diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 9b7fb9f52a..d204ee9dc9 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -3345,6 +3345,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) menu_hash_to_str(MENU_LABEL_VALUE_CORE_UPDATER_SETTINGS), PARSE_ONLY_GROUP, false); ret = menu_displaylist_parse_settings(menu, info, menu_hash_to_str(MENU_LABEL_VALUE_NETWORK_SETTINGS), PARSE_ONLY_GROUP, false); + ret = menu_displaylist_parse_settings(menu, info, + menu_hash_to_str(MENU_LABEL_VALUE_LAKKA_SERVICES), PARSE_ONLY_GROUP, false); ret = menu_displaylist_parse_settings(menu, info, menu_hash_to_str(MENU_LABEL_PLAYLIST_SETTINGS), PARSE_ACTION, false); ret = menu_displaylist_parse_settings(menu, info, diff --git a/menu/menu_hash.h b/menu/menu_hash.h index 6e16abc243..a9d4619b82 100644 --- a/menu/menu_hash.h +++ b/menu/menu_hash.h @@ -897,6 +897,7 @@ extern "C" { #define MENU_LABEL_VALUE_CORE_UPDATER_SETTINGS 0x124ad454U #define MENU_LABEL_NETWORK_SETTINGS 0x8b50d180U #define MENU_LABEL_VALUE_NETWORK_SETTINGS 0x8b50d180U +#define MENU_LABEL_VALUE_LAKKA_SERVICES 0x0c113d6dU #define MENU_LABEL_ARCHIVE_SETTINGS 0x78e85398U #define MENU_LABEL_USER_SETTINGS 0xcdc9a8f5U #define MENU_LABEL_VALUE_USER_SETTINGS 0xcdc9a8f5U diff --git a/menu/menu_setting.c b/menu/menu_setting.c index de569afa18..7a92c29884 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -3106,6 +3106,7 @@ enum settings_list_type SETTINGS_LIST_CHEEVOS, SETTINGS_LIST_CORE_UPDATER, SETTINGS_LIST_NETPLAY, + SETTINGS_LIST_LAKKA_SERVICES, SETTINGS_LIST_USER, SETTINGS_LIST_USER_ACCOUNTS, SETTINGS_LIST_USER_ACCOUNTS_CHEEVOS, @@ -6483,6 +6484,35 @@ static bool setting_append_list( #endif END_SUB_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group); +#endif + } + break; + case SETTINGS_LIST_LAKKA_SERVICES: + { +#if defined(HAVE_LAKKA) + START_GROUP(list, list_info, &group_info, + menu_hash_to_str(MENU_LABEL_VALUE_LAKKA_SERVICES), + parent_group); + + parent_group = menu_hash_to_str(MENU_LABEL_VALUE_SETTINGS); + + START_SUB_GROUP(list, list_info, "Lakka Services", &group_info, &subgroup_info, parent_group); + + CONFIG_BOOL( + list, list_info, + &global->netplay.enable, + menu_hash_to_str(MENU_LABEL_NETPLAY_ENABLE), + menu_hash_to_str(MENU_LABEL_VALUE_NETPLAY_ENABLE), + false, + menu_hash_to_str(MENU_VALUE_OFF), + menu_hash_to_str(MENU_VALUE_ON), + &group_info, + &subgroup_info, + parent_group, + general_write_handler, + general_read_handler); + END_SUB_GROUP(list, list_info, parent_group); + END_GROUP(list, list_info, parent_group); #endif } break; @@ -7216,6 +7246,7 @@ static rarch_setting_t *menu_setting_new_internal(rarch_setting_info_t *list_inf SETTINGS_LIST_CHEEVOS, SETTINGS_LIST_CORE_UPDATER, SETTINGS_LIST_NETPLAY, + SETTINGS_LIST_LAKKA_SERVICES, SETTINGS_LIST_USER, SETTINGS_LIST_USER_ACCOUNTS, SETTINGS_LIST_USER_ACCOUNTS_CHEEVOS,