From bb0059c721606bdbe19e325ba86ef5c837e1785a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 26 Sep 2018 23:00:00 +0200 Subject: [PATCH] Add Twitch list/Youtube list --- intl/msg_hash_ar.h | 8 +++++++ intl/msg_hash_chs.h | 8 +++++++ intl/msg_hash_cht.h | 8 +++++++ intl/msg_hash_de.h | 8 +++++++ intl/msg_hash_eo.h | 8 +++++++ intl/msg_hash_es.h | 8 +++++++ intl/msg_hash_fr.h | 8 +++++++ intl/msg_hash_it.h | 8 +++++++ intl/msg_hash_ja.h | 8 +++++++ intl/msg_hash_ko.h | 8 +++++++ intl/msg_hash_lbl.h | 8 +++++++ intl/msg_hash_nl.h | 8 +++++++ intl/msg_hash_pl.h | 8 +++++++ intl/msg_hash_pt_br.h | 8 +++++++ intl/msg_hash_pt_pt.h | 8 +++++++ intl/msg_hash_ru.h | 8 +++++++ intl/msg_hash_us.h | 8 +++++++ intl/msg_hash_vn.h | 8 +++++++ menu/cbs/menu_cbs_deferred_push.c | 18 +++++++++++++++ menu/cbs/menu_cbs_ok.c | 14 ++++++++++++ menu/cbs/menu_cbs_title.c | 18 +++++++++++++++ menu/menu_cbs.h | 2 ++ menu/menu_displaylist.c | 38 +++++++++++++++++++++++++++++++ menu/menu_displaylist.h | 2 ++ menu/menu_setting.c | 18 +++++++++++++++ msg_hash.h | 4 ++++ 26 files changed, 258 insertions(+) diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index a74f8553ab..198c8ac1f0 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -3639,3 +3639,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h index c87c2743a0..8678ab5e10 100644 --- a/intl/msg_hash_chs.h +++ b/intl/msg_hash_chs.h @@ -3423,3 +3423,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h index 38087ed8bd..7fe145858d 100644 --- a/intl/msg_hash_cht.h +++ b/intl/msg_hash_cht.h @@ -3415,3 +3415,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 88594fc318..c2cc07eff6 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -3525,3 +3525,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h index 719d9d8d4c..73c69d2769 100644 --- a/intl/msg_hash_eo.h +++ b/intl/msg_hash_eo.h @@ -3290,3 +3290,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 85d429f23c..bae5b5b649 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -7545,3 +7545,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 597f115585..5c10cc9465 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -3449,3 +3449,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 80b507fc3c..170eb0ec88 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -3509,3 +3509,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h index 4c4d8e2c7a..7fd7f82b30 100644 --- a/intl/msg_hash_ja.h +++ b/intl/msg_hash_ja.h @@ -3912,3 +3912,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 58df079663..ebfcfce345 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -3410,3 +3410,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h index a4a2c5a3e4..46db61489b 100644 --- a/intl/msg_hash_lbl.h +++ b/intl/msg_hash_lbl.h @@ -4,6 +4,10 @@ MSG_HASH(MENU_ENUM_LABEL_ACCOUNTS_LIST, "accounts_list") MSG_HASH(MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS, "retro_achievements") +MSG_HASH(MENU_ENUM_LABEL_ACCOUNTS_TWITCH, + "twitch") +MSG_HASH(MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE, + "youtube") MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST, "achievement_list") MSG_HASH(MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE, @@ -265,6 +269,10 @@ MSG_HASH(MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_LIST, "deferred_browse_url_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, "deferred_accounts_cheevos_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST, + "deferred_accounts_twitch_list") +MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST, + "deferred_accounts_youtube_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST, "deferred_accounts_list") MSG_HASH(MENU_ENUM_LABEL_DEFERRED_ARCHIVE_ACTION, diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h index 235bd5be1e..f5343afc7a 100644 --- a/intl/msg_hash_nl.h +++ b/intl/msg_hash_nl.h @@ -3284,3 +3284,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Poort" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h index 71a903dd96..11f65a864e 100644 --- a/intl/msg_hash_pl.h +++ b/intl/msg_hash_pl.h @@ -3712,3 +3712,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h index ab18f6e349..7288ec4122 100644 --- a/intl/msg_hash_pt_br.h +++ b/intl/msg_hash_pt_br.h @@ -7528,3 +7528,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h index 1a168d0a9e..b584e53038 100644 --- a/intl/msg_hash_pt_pt.h +++ b/intl/msg_hash_pt_pt.h @@ -3376,3 +3376,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index 5972d53397..926f445550 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -3579,3 +3579,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 2820412ee8..9539802444 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -7566,3 +7566,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index 99aa5ba5ac..bdb45fb9d9 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -3447,3 +3447,11 @@ MSG_HASH( MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT, "UDP Stream Port" ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + "Twitch" + ) +MSG_HASH( + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + "YouTube" + ) diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c index fd5008c71b..9b76a19b6f 100644 --- a/menu/cbs/menu_cbs_deferred_push.c +++ b/menu/cbs/menu_cbs_deferred_push.c @@ -170,6 +170,8 @@ generic_deferred_push(deferred_push_recording_settings_list, DISPLAYLIST_ generic_deferred_push(deferred_push_playlist_settings_list, DISPLAYLIST_PLAYLIST_SETTINGS_LIST) generic_deferred_push(deferred_push_input_hotkey_binds_list, DISPLAYLIST_INPUT_HOTKEY_BINDS_LIST) generic_deferred_push(deferred_push_accounts_cheevos_list, DISPLAYLIST_ACCOUNTS_CHEEVOS_LIST) +generic_deferred_push(deferred_push_accounts_twitch_list, DISPLAYLIST_ACCOUNTS_TWITCH_LIST) +generic_deferred_push(deferred_push_accounts_youtube_list, DISPLAYLIST_ACCOUNTS_YOUTUBE_LIST) generic_deferred_push(deferred_push_help, DISPLAYLIST_HELP_SCREEN_LIST) generic_deferred_push(deferred_push_rdb_entry_detail, DISPLAYLIST_DATABASE_ENTRY) generic_deferred_push(deferred_push_rpl_entry_actions, DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS) @@ -950,6 +952,16 @@ static int menu_cbs_init_bind_deferred_push_compare_label( { BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_quick_menu_override_options); } + else if (strstr(label, + msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST))) + { + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_youtube_list); + } + else if (strstr(label, + msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST))) + { + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_twitch_list); + } else { if (cbs->enum_idx != MSG_UNKNOWN) @@ -977,6 +989,12 @@ static int menu_cbs_init_bind_deferred_push_compare_label( case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_cheevos_list); break; + case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_youtube_list); + break; + case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST: + BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_accounts_twitch_list); + break; case MENU_ENUM_LABEL_DEFERRED_ARCHIVE_ACTION_DETECT_CORE: BIND_ACTION_DEFERRED_PUSH(cbs, deferred_archive_action_detect_core); break; diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index e482dcd0c5..64520b48a6 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -231,6 +231,10 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl) return MENU_ENUM_LABEL_DEFERRED_PLAYLIST_SETTINGS_LIST; case ACTION_OK_DL_ACCOUNTS_CHEEVOS_LIST: return MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST; + case ACTION_OK_DL_ACCOUNTS_TWITCH_LIST: + return MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST; + case ACTION_OK_DL_ACCOUNTS_YOUTUBE_LIST: + return MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST; case ACTION_OK_DL_PLAYLIST_COLLECTION: return MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST; case ACTION_OK_DL_FAVORITES_LIST: @@ -813,6 +817,8 @@ int generic_action_ok_displaylist_push(const char *path, case ACTION_OK_DL_RECORDING_SETTINGS_LIST: case ACTION_OK_DL_PLAYLIST_SETTINGS_LIST: case ACTION_OK_DL_ACCOUNTS_CHEEVOS_LIST: + case ACTION_OK_DL_ACCOUNTS_YOUTUBE_LIST: + case ACTION_OK_DL_ACCOUNTS_TWITCH_LIST: case ACTION_OK_DL_PLAYLIST_COLLECTION: case ACTION_OK_DL_FAVORITES_LIST: case ACTION_OK_DL_BROWSE_URL_LIST: @@ -3734,6 +3740,8 @@ default_action_ok_func(action_ok_push_playlist_settings_list, ACTION_OK_DL_PLAYL default_action_ok_func(action_ok_push_input_hotkey_binds_list, ACTION_OK_DL_INPUT_HOTKEY_BINDS_LIST) default_action_ok_func(action_ok_push_user_binds_list, ACTION_OK_DL_USER_BINDS_LIST) default_action_ok_func(action_ok_push_accounts_cheevos_list, ACTION_OK_DL_ACCOUNTS_CHEEVOS_LIST) +default_action_ok_func(action_ok_push_accounts_youtube_list, ACTION_OK_DL_ACCOUNTS_YOUTUBE_LIST) +default_action_ok_func(action_ok_push_accounts_twitch_list, ACTION_OK_DL_ACCOUNTS_TWITCH_LIST) default_action_ok_func(action_ok_open_archive, ACTION_OK_DL_OPEN_ARCHIVE) static int action_ok_shader_pass(const char *path, @@ -4901,6 +4909,12 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS: BIND_ACTION_OK(cbs, action_ok_push_accounts_cheevos_list); break; + case MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE: + BIND_ACTION_OK(cbs, action_ok_push_accounts_youtube_list); + break; + case MENU_ENUM_LABEL_ACCOUNTS_TWITCH: + BIND_ACTION_OK(cbs, action_ok_push_accounts_twitch_list); + break; case MENU_ENUM_LABEL_SHADER_OPTIONS: case MENU_ENUM_LABEL_CORE_OPTIONS: case MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS: diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c index 4d5eb60cdc..cf974172f4 100644 --- a/menu/cbs/menu_cbs_title.c +++ b/menu/cbs/menu_cbs_title.c @@ -93,6 +93,8 @@ static int action_get_title_mixer_stream_actions(const char *path, const char *l default_title_macro(action_get_quick_menu_override_options, MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS) default_title_macro(action_get_user_accounts_cheevos_list, MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS) +default_title_macro(action_get_user_accounts_youtube_list, MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE) +default_title_macro(action_get_user_accounts_twitch_list, MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH) default_title_macro(action_get_download_core_content_list, MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT) default_title_macro(action_get_user_accounts_list, MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST) default_title_macro(action_get_core_information_list, MENU_ENUM_LABEL_VALUE_CORE_INFORMATION) @@ -549,6 +551,16 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, BIND_ACTION_GET_TITLE(cbs, action_get_crt_switchres_settings_list); return 0; } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_twitch_list); + return 0; + } + else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST))) + { + BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_youtube_list); + return 0; + } else if (cbs->enum_idx != MSG_UNKNOWN) { switch (cbs->enum_idx) @@ -822,6 +834,12 @@ static int menu_cbs_init_bind_title_compare_label(menu_file_list_cbs_t *cbs, case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_cheevos_list); break; + case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST: + BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_twitch_list); + break; + case MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST: + BIND_ACTION_GET_TITLE(cbs, action_get_user_accounts_youtube_list); + break; case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_LIST: case MENU_ENUM_LABEL_DEFERRED_CORE_CONTENT_DIRS_SUBDIR_LIST: BIND_ACTION_GET_TITLE(cbs, action_get_download_core_content_list); diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h index 3126f8d2bf..fbddf0e4d9 100644 --- a/menu/menu_cbs.h +++ b/menu/menu_cbs.h @@ -85,6 +85,8 @@ enum ACTION_OK_DL_PLAYLIST_SETTINGS_LIST, ACTION_OK_DL_ACCOUNTS_LIST, ACTION_OK_DL_ACCOUNTS_CHEEVOS_LIST, + ACTION_OK_DL_ACCOUNTS_YOUTUBE_LIST, + ACTION_OK_DL_ACCOUNTS_TWITCH_LIST, ACTION_OK_DL_USER_BINDS_LIST, ACTION_OK_DL_CONTENT_LIST, ACTION_OK_DL_REMAP_FILE, diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 1f54307cbf..f16d822854 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -7290,6 +7290,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) PARSE_ACTION, false) == 0) count++; + if (menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE, + PARSE_ACTION, false) == 0) + count++; + + if (menu_displaylist_parse_settings_enum(menu, info, + MENU_ENUM_LABEL_ACCOUNTS_TWITCH, + PARSE_ACTION, false) == 0) + count++; + if (count == 0) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS), @@ -7313,6 +7323,34 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data) PARSE_ONLY_STRING, false) == 0) count++; + if (count == 0) + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS), + msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), + MENU_ENUM_LABEL_NO_ITEMS, + MENU_SETTING_NO_ITEM, 0, 0); + + ret = 0; + info->need_refresh = true; + info->need_push = true; + break; + case DISPLAYLIST_ACCOUNTS_YOUTUBE_LIST: + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); + + if (count == 0) + menu_entries_append_enum(info->list, + msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS), + msg_hash_to_str(MENU_ENUM_LABEL_NO_ITEMS), + MENU_ENUM_LABEL_NO_ITEMS, + MENU_SETTING_NO_ITEM, 0, 0); + + ret = 0; + info->need_refresh = true; + info->need_push = true; + break; + case DISPLAYLIST_ACCOUNTS_TWITCH_LIST: + menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list); + if (count == 0) menu_entries_append_enum(info->list, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ITEMS), diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h index 5a8d49b79f..d87c804527 100644 --- a/menu/menu_displaylist.h +++ b/menu/menu_displaylist.h @@ -154,6 +154,8 @@ enum menu_displaylist_ctl_state DISPLAYLIST_RECORDING_SETTINGS_LIST, DISPLAYLIST_PLAYLIST_SETTINGS_LIST, DISPLAYLIST_ACCOUNTS_CHEEVOS_LIST, + DISPLAYLIST_ACCOUNTS_YOUTUBE_LIST, + DISPLAYLIST_ACCOUNTS_TWITCH_LIST, DISPLAYLIST_BROWSE_URL_LIST, DISPLAYLIST_BROWSE_URL_START, DISPLAYLIST_LOAD_CONTENT_LIST, diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 7a3086f291..93c7b6993b 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -133,6 +133,8 @@ enum settings_list_type SETTINGS_LIST_USER, SETTINGS_LIST_USER_ACCOUNTS, SETTINGS_LIST_USER_ACCOUNTS_CHEEVOS, + SETTINGS_LIST_USER_ACCOUNTS_YOUTUBE, + SETTINGS_LIST_USER_ACCOUNTS_TWITCH, SETTINGS_LIST_DIRECTORY, SETTINGS_LIST_PRIVACY, SETTINGS_LIST_MIDI @@ -9568,6 +9570,22 @@ static bool setting_append_list( parent_group); #endif + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_ACCOUNTS_YOUTUBE, + MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE, + &group_info, + &subgroup_info, + parent_group); + + CONFIG_ACTION( + list, list_info, + MENU_ENUM_LABEL_ACCOUNTS_TWITCH, + MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH, + &group_info, + &subgroup_info, + parent_group); + END_SUB_GROUP(list, list_info, parent_group); END_GROUP(list, list_info, parent_group); break; diff --git a/msg_hash.h b/msg_hash.h index 173ba10965..27a7cddedc 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -966,6 +966,8 @@ enum msg_hash_enums MENU_LABEL(CHEEVOS_UNLOCKED_ACHIEVEMENTS), MENU_LABEL(CHEEVOS_LOCKED_ACHIEVEMENTS), MENU_LABEL(ACCOUNTS_RETRO_ACHIEVEMENTS), + MENU_LABEL(ACCOUNTS_TWITCH), + MENU_LABEL(ACCOUNTS_YOUTUBE), MENU_LABEL(ACCOUNTS_LIST), @@ -1071,6 +1073,8 @@ enum msg_hash_enums MENU_ENUM_LABEL_DEFERRED_CORE_SETTINGS_LIST, MENU_ENUM_LABEL_DEFERRED_USER_BINDS_LIST, MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_CHEEVOS_LIST, + MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_TWITCH_LIST, + MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_YOUTUBE_LIST, MENU_ENUM_LABEL_DEFERRED_ACCOUNTS_LIST, MENU_LABEL(FILE_DETECT_CORE_LIST_PUSH_DIR),