Add Twitch list/Youtube list

This commit is contained in:
twinaphex 2018-09-26 23:00:00 +02:00
parent 8c101fdfd6
commit bb0059c721
26 changed files with 258 additions and 0 deletions

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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,

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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"
)

View File

@ -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;

View File

@ -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:

View File

@ -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);

View File

@ -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,

View File

@ -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),

View File

@ -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,

View File

@ -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;

View File

@ -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),