mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 13:20:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Music/Image/Video lists for MaterialUI and RGUI

Browse Source
This commit is contained in:
twinaphex 2017-08-16 03:15:04 +02:00
parent 0d86027cd5
commit 5c7fd82a40
9 changed files with 172 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
intl/msg_hash_lbl.h
View File

@ -231,6 +231,12 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,
"database_manager_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST,
"deferred_favorites_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST,
"deferred_images_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST,
"deferred_music_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST,
"deferred_video_list")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_NETPLAY,
"deferred_netplay")
MSG_HASH(MENU_ENUM_LABEL_DEFERRED_MUSIC,
@ -1283,3 +1289,9 @@ MSG_HASH(MENU_ENUM_LABEL_MENU_FRAMEBUFFER_OPACITY,
"menu_framebuffer_opacity")
MSG_HASH(MENU_ENUM_LABEL_GOTO_FAVORITES,
"goto_favorites")
MSG_HASH(MENU_ENUM_LABEL_GOTO_MUSIC,
"goto_music")
MSG_HASH(MENU_ENUM_LABEL_GOTO_IMAGES,
"goto_images")
MSG_HASH(MENU_ENUM_LABEL_GOTO_VIDEO,
"goto_video")

12
intl/msg_hash_us.h
View File

@ -3113,3 +3113,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES,
"Favorites")
MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES,
"Content which you have added to 'Favorites' will appear here.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC,
"Music")
MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC,
"Music which has been previously played will appear here.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES,
"Image")
MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES,
"Images which has been previously viewed will appear here.")
MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO,
"Video")
MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO,
"Videos which have been previously played will appear here.")

39
menu/cbs/menu_cbs_deferred_push.c
View File

@ -821,6 +821,24 @@ static int deferred_push_detect_core_list(menu_displaylist_info_t *info)
DISPLAYLIST_CORES_DETECTED);
}
static int deferred_music_history_list(menu_displaylist_info_t *info)
{
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
return general_push(info, PUSH_DEFAULT, DISPLAYLIST_MUSIC_HISTORY);
}
static int deferred_image_history_list(menu_displaylist_info_t *info)
{
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
return general_push(info, PUSH_DEFAULT, DISPLAYLIST_IMAGES_HISTORY);
}
static int deferred_video_history_list(menu_displaylist_info_t *info)
{
menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
return general_push(info, PUSH_DEFAULT, DISPLAYLIST_VIDEO_HISTORY);
}
static int deferred_archive_open_detect_core(menu_displaylist_info_t *info)
{
return general_push(info, PUSH_ARCHIVE_OPEN_DETECT_CORE,
@ -1085,11 +1103,30 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
#endif
return 0;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC)))
else if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_music_list);
return 0;
}
else if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_music_history_list);
return 0;
}
else if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_image_history_list);
return 0;
}
else if (
string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_video_history_list);
return 0;
}
else if (strstr(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RDB_ENTRY_DETAIL)))
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_entry_detail);

39
menu/cbs/menu_cbs_ok.c
View File

@ -168,6 +168,33 @@ int generic_action_ok_displaylist_push(const char *path,
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_IMAGES_LIST:
info.type = type;
info.directory_ptr = idx;
info_path = label;
info_label = msg_hash_to_str(
MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_MUSIC_LIST:
info.type = type;
info.directory_ptr = idx;
info_path = label;
info_label = msg_hash_to_str(
MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_VIDEO_LIST:
info.type = type;
info.directory_ptr = idx;
info_path = label;
info_label = msg_hash_to_str(
MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST);
info.enum_idx = MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST;
dl_type = DISPLAYLIST_GENERIC;
break;
case ACTION_OK_DL_USER_BINDS_LIST:
info.type = type;
info.directory_ptr = idx;
@ -3203,6 +3230,9 @@ int (func_name)(const char *path, const char *label, unsigned type, size_t idx,
default_action_ok_func(action_ok_browse_url_start, ACTION_OK_DL_BROWSE_URL_START)
default_action_ok_func(action_ok_goto_favorites, ACTION_OK_DL_FAVORITES_LIST)
default_action_ok_func(action_ok_goto_images, ACTION_OK_DL_IMAGES_LIST)
default_action_ok_func(action_ok_goto_video, ACTION_OK_DL_VIDEO_LIST)
default_action_ok_func(action_ok_goto_music, ACTION_OK_DL_MUSIC_LIST)
default_action_ok_func(action_ok_shader_parameters, ACTION_OK_DL_SHADER_PARAMETERS)
default_action_ok_func(action_ok_parent_directory_push, ACTION_OK_DL_PARENT_DIRECTORY_PUSH)
default_action_ok_func(action_ok_directory_push, ACTION_OK_DL_DIRECTORY_PUSH)
@ -4140,6 +4170,15 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_GOTO_FAVORITES:
BIND_ACTION_OK(cbs, action_ok_goto_favorites);
break;
case MENU_ENUM_LABEL_GOTO_MUSIC:
BIND_ACTION_OK(cbs, action_ok_goto_music);
break;
case MENU_ENUM_LABEL_GOTO_IMAGES:
BIND_ACTION_OK(cbs, action_ok_goto_images);
break;
case MENU_ENUM_LABEL_GOTO_VIDEO:
BIND_ACTION_OK(cbs, action_ok_goto_video);
break;
case MENU_ENUM_LABEL_BROWSE_START:
BIND_ACTION_OK(cbs, action_ok_browse_url_start);
break;

12
menu/cbs/menu_cbs_sublabel.c
View File

@ -235,6 +235,9 @@ default_sublabel_macro(action_bind_sublabel_information,
default_sublabel_macro(action_bind_sublabel_run, MENU_ENUM_SUBLABEL_RUN)
default_sublabel_macro(action_bind_sublabel_add_to_favorites, MENU_ENUM_SUBLABEL_ADD_TO_FAVORITES)
default_sublabel_macro(action_bind_sublabel_goto_favorites, MENU_ENUM_SUBLABEL_GOTO_FAVORITES)
default_sublabel_macro(action_bind_sublabel_goto_images, MENU_ENUM_SUBLABEL_GOTO_IMAGES)
default_sublabel_macro(action_bind_sublabel_goto_music, MENU_ENUM_SUBLABEL_GOTO_MUSIC)
default_sublabel_macro(action_bind_sublabel_goto_video, MENU_ENUM_SUBLABEL_GOTO_VIDEO)
default_sublabel_macro(action_bind_sublabel_menu_filebrowser_settings, MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS)
default_sublabel_macro(action_bind_sublabel_auto_remaps_enable, MENU_ENUM_SUBLABEL_AUTO_REMAPS_ENABLE)
default_sublabel_macro(action_bind_sublabel_auto_overrides_enable, MENU_ENUM_SUBLABEL_AUTO_OVERRIDES_ENABLE)
@ -547,6 +550,15 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
case MENU_ENUM_LABEL_XMB_SHOW_SETTINGS:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_settings_tab);
break;
case MENU_ENUM_LABEL_GOTO_IMAGES:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_images);
break;
case MENU_ENUM_LABEL_GOTO_MUSIC:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_music);
break;
case MENU_ENUM_LABEL_GOTO_VIDEO:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_video);
break;
case MENU_ENUM_LABEL_GOTO_FAVORITES:
BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_goto_favorites);
break;

15
menu/drivers/materialui.c
View File

@ -2293,6 +2293,21 @@ static void mui_list_insert(void *userdata,
node->texture_switch2 = mui->textures.list[MUI_TEXTURE_INFO];
node->texture_switch2_set = true;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES)))
{
node->texture_switch2 = mui->textures.list[MUI_TEXTURE_IMAGE];
node->texture_switch2_set = true;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC)))
{
node->texture_switch2 = mui->textures.list[MUI_TEXTURE_MUSIC];
node->texture_switch2_set = true;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO)))
{
node->texture_switch2 = mui->textures.list[MUI_TEXTURE_VIDEO];
node->texture_switch2_set = true;
}
else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY)))
{
node->texture_switch2 = mui->textures.list[MUI_TEXTURE_SCAN];

3
menu/menu_cbs.h
View File

@ -42,6 +42,9 @@ enum
ACTION_OK_DL_AUDIO_DSP_PLUGIN,
ACTION_OK_DL_SHADER_PASS,
ACTION_OK_DL_FAVORITES_LIST,
ACTION_OK_DL_IMAGES_LIST,
ACTION_OK_DL_VIDEO_LIST,
ACTION_OK_DL_MUSIC_LIST,
ACTION_OK_DL_SHADER_PARAMETERS,
ACTION_OK_DL_SHADER_PRESET,
ACTION_OK_DL_GENERIC,

35
menu/menu_displaylist.c
View File

@ -3510,6 +3510,23 @@ static int menu_displaylist_parse_playlists(
MENU_ENUM_LABEL_GOTO_FAVORITES,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES),
MENU_ENUM_LABEL_GOTO_IMAGES,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC),
MENU_ENUM_LABEL_GOTO_MUSIC,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO),
MENU_ENUM_LABEL_GOTO_VIDEO,
MENU_SETTING_ACTION, 0, 0);
if (list_size == 0)
{
@ -6025,6 +6042,24 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
MENU_ENUM_LABEL_GOTO_FAVORITES,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_IMAGES),
MENU_ENUM_LABEL_GOTO_IMAGES,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_MUSIC),
MENU_ENUM_LABEL_GOTO_MUSIC,
MENU_SETTING_ACTION, 0, 0);
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO),
msg_hash_to_str(MENU_ENUM_LABEL_GOTO_VIDEO),
MENU_ENUM_LABEL_GOTO_VIDEO,
MENU_SETTING_ACTION, 0, 0);
if (!string_is_empty(settings->paths.directory_menu_content))
menu_entries_append_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES),

6
msg_hash.h
View File

@ -738,6 +738,9 @@ enum msg_hash_enums
MENU_LABEL(PLAYLIST_ENTRY_REMOVE),
MENU_LABEL(PLAYLIST_ENTRY_RENAME),
MENU_LABEL(GOTO_FAVORITES),
MENU_LABEL(GOTO_MUSIC),
MENU_LABEL(GOTO_IMAGES),
MENU_LABEL(GOTO_VIDEO),
MENU_LABEL(ADD_TO_FAVORITES),
MENU_LABEL(MENU_THROTTLE_FRAMERATE),
MENU_LABEL(NO_ACHIEVEMENTS_TO_DISPLAY),
@ -827,6 +830,9 @@ enum msg_hash_enums
MENU_LABEL(BROWSE_START),
/* Deferred */
MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST,
MENU_ENUM_LABEL_DEFERRED_IMAGES_LIST,
MENU_ENUM_LABEL_DEFERRED_MUSIC_LIST,
MENU_ENUM_LABEL_DEFERRED_VIDEO_LIST,
MENU_ENUM_LABEL_DEFERRED_NETPLAY,
MENU_ENUM_LABEL_DEFERRED_MUSIC,
MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_START,