libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-25 12:20:48 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

Rename MENU_FILE_ to FILE_TYPE_

Browse Source
This commit is contained in:
twinaphex 2016-06-20 15:50:37 +02:00
parent f22755f31b
commit a585017208
18 changed files with 373 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/cbs/menu_cbs_deferred_push.c
View File

@ -386,7 +386,7 @@ static int general_push(menu_displaylist_info_t *info,
break;
}
info->type_default = MENU_FILE_PLAIN;
info->type_default = FILE_TYPE_PLAIN;
switch (id)
{
@ -1084,7 +1084,7 @@ static int menu_cbs_init_bind_deferred_push_compare_type(
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_category);
}
else if (type == MENU_FILE_PLAYLIST_COLLECTION)
else if (type == FILE_TYPE_PLAYLIST_COLLECTION)
{
BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_rdb_collection);
}

44
menu/cbs/menu_cbs_get_value.c
View File

@ -1594,88 +1594,88 @@ static int menu_cbs_init_bind_get_string_representation_compare_type(
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_core_option_create);
break;
case MENU_FILE_CORE:
case FILE_TYPE_CORE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_core);
break;
case MENU_FILE_PLAIN:
case FILE_TYPE_PLAIN:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_plain);
break;
case MENU_FILE_MOVIE:
case FILE_TYPE_MOVIE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_movie);
break;
case MENU_FILE_MUSIC:
case FILE_TYPE_MUSIC:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_music);
break;
case MENU_FILE_IMAGE:
case FILE_TYPE_IMAGE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_image);
break;
case MENU_FILE_IMAGEVIEWER:
case FILE_TYPE_IMAGEVIEWER:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_imageviewer);
break;
case MENU_FILE_USE_DIRECTORY:
case FILE_TYPE_USE_DIRECTORY:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_use_directory);
break;
case MENU_FILE_DIRECTORY:
case FILE_TYPE_DIRECTORY:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_directory);
break;
case MENU_FILE_PARENT_DIRECTORY:
case FILE_TYPE_PARENT_DIRECTORY:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_parent_directory);
break;
case MENU_FILE_CARCHIVE:
case FILE_TYPE_CARCHIVE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_carchive);
break;
case MENU_FILE_OVERLAY:
case FILE_TYPE_OVERLAY:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_overlay);
break;
case MENU_FILE_FONT:
case FILE_TYPE_FONT:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_font);
break;
case MENU_FILE_SHADER:
case FILE_TYPE_SHADER:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_shader);
break;
case MENU_FILE_SHADER_PRESET:
case FILE_TYPE_SHADER_PRESET:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_shader_preset);
break;
case MENU_FILE_CONFIG:
case FILE_TYPE_CONFIG:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_config);
break;
case MENU_FILE_IN_CARCHIVE:
case FILE_TYPE_IN_CARCHIVE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_in_carchive);
break;
case MENU_FILE_VIDEOFILTER:
case MENU_FILE_AUDIOFILTER:
case FILE_TYPE_VIDEOFILTER:
case FILE_TYPE_AUDIOFILTER:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_filter);
break;
case MENU_FILE_DOWNLOAD_CORE:
case FILE_TYPE_DOWNLOAD_CORE:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_url_core);
break;
case MENU_FILE_RDB:
case FILE_TYPE_RDB:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_rdb);
break;
case MENU_FILE_CURSOR:
case FILE_TYPE_CURSOR:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_cursor);
break;
case MENU_FILE_CHEAT:
case FILE_TYPE_CHEAT:
BIND_ACTION_GET_VALUE(cbs,
menu_action_setting_disp_set_label_menu_file_cheat);
break;

58
menu/cbs/menu_cbs_left.c
View File

@ -536,35 +536,35 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
BIND_ACTION_LEFT(cbs, disk_options_disk_idx_left);
break;
case MENU_FILE_PLAIN:
case MENU_FILE_DIRECTORY:
case MENU_FILE_CARCHIVE:
case MENU_FILE_IN_CARCHIVE:
case MENU_FILE_CORE:
case MENU_FILE_RDB:
case MENU_FILE_RDB_ENTRY:
case MENU_FILE_RPL_ENTRY:
case MENU_FILE_CURSOR:
case MENU_FILE_SHADER:
case MENU_FILE_SHADER_PRESET:
case MENU_FILE_IMAGE:
case MENU_FILE_OVERLAY:
case MENU_FILE_VIDEOFILTER:
case MENU_FILE_AUDIOFILTER:
case MENU_FILE_CONFIG:
case MENU_FILE_USE_DIRECTORY:
case MENU_FILE_PLAYLIST_ENTRY:
case FILE_TYPE_PLAIN:
case FILE_TYPE_DIRECTORY:
case FILE_TYPE_CARCHIVE:
case FILE_TYPE_IN_CARCHIVE:
case FILE_TYPE_CORE:
case FILE_TYPE_RDB:
case FILE_TYPE_RDB_ENTRY:
case FILE_TYPE_RPL_ENTRY:
case FILE_TYPE_CURSOR:
case FILE_TYPE_SHADER:
case FILE_TYPE_SHADER_PRESET:
case FILE_TYPE_IMAGE:
case FILE_TYPE_OVERLAY:
case FILE_TYPE_VIDEOFILTER:
case FILE_TYPE_AUDIOFILTER:
case FILE_TYPE_CONFIG:
case FILE_TYPE_USE_DIRECTORY:
case FILE_TYPE_PLAYLIST_ENTRY:
case MENU_INFO_MESSAGE:
case MENU_FILE_DOWNLOAD_CORE:
case MENU_FILE_CHEAT:
case MENU_FILE_REMAP:
case MENU_FILE_MOVIE:
case MENU_FILE_MUSIC:
case MENU_FILE_IMAGEVIEWER:
case MENU_FILE_PLAYLIST_COLLECTION:
case MENU_FILE_DOWNLOAD_CORE_CONTENT:
case MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT:
case MENU_FILE_SCAN_DIRECTORY:
case FILE_TYPE_DOWNLOAD_CORE:
case FILE_TYPE_CHEAT:
case FILE_TYPE_REMAP:
case FILE_TYPE_MOVIE:
case FILE_TYPE_MUSIC:
case FILE_TYPE_IMAGEVIEWER:
case FILE_TYPE_PLAYLIST_COLLECTION:
case FILE_TYPE_DOWNLOAD_CORE_CONTENT:
case FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT:
case FILE_TYPE_SCAN_DIRECTORY:
case MENU_SETTING_GROUP:
if ( string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_HISTORY_TAB)) ||
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB)) ||
@ -579,7 +579,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
BIND_ACTION_LEFT(cbs, action_left_scroll);
break;
case MENU_SETTING_ACTION:
case MENU_FILE_CONTENTLIST_ENTRY:
case FILE_TYPE_CONTENTLIST_ENTRY:
BIND_ACTION_LEFT(cbs, action_left_mainmenu);
break;
default:

78
menu/cbs/menu_cbs_ok.c
View File

@ -235,13 +235,13 @@ int generic_action_ok_displaylist_push(const char *path,
info_label = label;
break;
case ACTION_OK_DL_DOWNLOADS_DIR:
info.type = MENU_FILE_DIRECTORY;
info.type = FILE_TYPE_DIRECTORY;
info.directory_ptr = idx;
info_path = settings->directory.core_assets;
info_label = label;
break;
case ACTION_OK_DL_CONTENT_LIST:
info.type = MENU_FILE_DIRECTORY;
info.type = FILE_TYPE_DIRECTORY;
info.directory_ptr = idx;
info_path = settings->directory.menu_content;
info_label = label;
@ -1475,7 +1475,7 @@ static int action_ok_file_load(const char *path,
if (menu_setting_get_type(setting) == ST_PATH)
return action_ok_set_path(path, label, type, idx, entry_idx);
if (type == MENU_FILE_IN_CARCHIVE)
if (type == FILE_TYPE_IN_CARCHIVE)
fill_pathname_join_delim(full_path_new, menu_path_new, path,
'#',sizeof(full_path_new));
else
@ -2995,7 +2995,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
case MENU_SETTING_ACTION_CORE_DISK_OPTIONS:
BIND_ACTION_OK(cbs, action_ok_push_default);
break;
case MENU_FILE_PLAYLIST_ENTRY:
case FILE_TYPE_PLAYLIST_ENTRY:
if (label_hash == MENU_LABEL_COLLECTION)
{
BIND_ACTION_OK(cbs, action_ok_playlist_entry_collection);
@ -3003,25 +3003,25 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
else
BIND_ACTION_OK(cbs, action_ok_playlist_entry);
break;
case MENU_FILE_RPL_ENTRY:
case FILE_TYPE_RPL_ENTRY:
BIND_ACTION_OK(cbs, action_ok_rpl_entry);
break;
case MENU_FILE_PLAYLIST_COLLECTION:
case FILE_TYPE_PLAYLIST_COLLECTION:
BIND_ACTION_OK(cbs, action_ok_playlist_collection);
break;
case MENU_FILE_CONTENTLIST_ENTRY:
case FILE_TYPE_CONTENTLIST_ENTRY:
BIND_ACTION_OK(cbs, action_ok_push_generic_list);
break;
case MENU_FILE_CHEAT:
case FILE_TYPE_CHEAT:
BIND_ACTION_OK(cbs, action_ok_cheat_file_load);
break;
case MENU_FILE_RECORD_CONFIG:
case FILE_TYPE_RECORD_CONFIG:
BIND_ACTION_OK(cbs, action_ok_record_configfile_load);
break;
case MENU_FILE_REMAP:
case FILE_TYPE_REMAP:
BIND_ACTION_OK(cbs, action_ok_remap_file_load);
break;
case MENU_FILE_SHADER_PRESET:
case FILE_TYPE_SHADER_PRESET:
switch (menu_label_hash)
{
case MENU_LABEL_SCAN_FILE:
@ -3031,7 +3031,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_SHADER:
case FILE_TYPE_SHADER:
switch (menu_label_hash)
{
case MENU_LABEL_SCAN_FILE:
@ -3041,7 +3041,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_IMAGE:
case FILE_TYPE_IMAGE:
switch (menu_label_hash)
{
case MENU_LABEL_SCAN_FILE:
@ -3051,24 +3051,24 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_USE_DIRECTORY:
case FILE_TYPE_USE_DIRECTORY:
BIND_ACTION_OK(cbs, action_ok_path_use_directory);
break;
#ifdef HAVE_LIBRETRODB
case MENU_FILE_SCAN_DIRECTORY:
case FILE_TYPE_SCAN_DIRECTORY:
BIND_ACTION_OK(cbs, action_ok_path_scan_directory);
break;
#endif
case MENU_FILE_CONFIG:
case FILE_TYPE_CONFIG:
BIND_ACTION_OK(cbs, action_ok_config_load);
break;
case MENU_FILE_PARENT_DIRECTORY:
case FILE_TYPE_PARENT_DIRECTORY:
BIND_ACTION_OK(cbs, action_ok_parent_directory_push);
break;
case MENU_FILE_DIRECTORY:
case FILE_TYPE_DIRECTORY:
BIND_ACTION_OK(cbs, action_ok_directory_push);
break;
case MENU_FILE_CARCHIVE:
case FILE_TYPE_CARCHIVE:
switch (menu_label_hash)
{
case MENU_LABEL_DETECT_CORE_LIST:
@ -3081,7 +3081,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_CORE:
case FILE_TYPE_CORE:
if (cbs && cbs->enum_idx != MSG_UNKNOWN)
{
switch (cbs->enum_idx)
@ -3110,24 +3110,24 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
}
}
break;
case MENU_FILE_DOWNLOAD_CORE_CONTENT:
case FILE_TYPE_DOWNLOAD_CORE_CONTENT:
BIND_ACTION_OK(cbs, action_ok_core_content_download);
break;
case MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT:
case FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT:
BIND_ACTION_OK(cbs, action_ok_core_content_thumbnails);
break;
case MENU_FILE_DOWNLOAD_CORE:
case FILE_TYPE_DOWNLOAD_CORE:
BIND_ACTION_OK(cbs, action_ok_core_updater_download);
break;
case MENU_FILE_DOWNLOAD_THUMBNAIL:
case FILE_TYPE_DOWNLOAD_THUMBNAIL:
BIND_ACTION_OK(cbs, action_ok_thumbnails_updater_download);
break;
case MENU_FILE_DOWNLOAD_LAKKA:
case FILE_TYPE_DOWNLOAD_LAKKA:
BIND_ACTION_OK(cbs, action_ok_lakka_download);
break;
case MENU_FILE_DOWNLOAD_CORE_INFO:
case FILE_TYPE_DOWNLOAD_CORE_INFO:
break;
case MENU_FILE_RDB:
case FILE_TYPE_RDB:
switch (menu_label_hash)
{
case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
@ -3139,10 +3139,10 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_RDB_ENTRY:
case FILE_TYPE_RDB_ENTRY:
BIND_ACTION_OK(cbs, action_ok_rdb_entry);
break;
case MENU_FILE_CURSOR:
case FILE_TYPE_CURSOR:
switch (menu_label_hash)
{
case MENU_LABEL_DEFERRED_DATABASE_MANAGER_LIST:
@ -3153,16 +3153,16 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_FONT:
case MENU_FILE_OVERLAY:
case MENU_FILE_AUDIOFILTER:
case MENU_FILE_VIDEOFILTER:
case FILE_TYPE_FONT:
case FILE_TYPE_OVERLAY:
case FILE_TYPE_AUDIOFILTER:
case FILE_TYPE_VIDEOFILTER:
BIND_ACTION_OK(cbs, action_ok_set_path);
break;
#ifdef HAVE_COMPRESSION
case MENU_FILE_IN_CARCHIVE:
case FILE_TYPE_IN_CARCHIVE:
#endif
case MENU_FILE_PLAIN:
case FILE_TYPE_PLAIN:
switch (menu_label_hash)
{
#ifdef HAVE_LIBRETRODB
@ -3174,7 +3174,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
case MENU_LABEL_DETECT_CORE_LIST:
case MENU_LABEL_DEFERRED_ARCHIVE_OPEN_DETECT_CORE:
#ifdef HAVE_COMPRESSION
if (type == MENU_FILE_IN_CARCHIVE)
if (type == FILE_TYPE_IN_CARCHIVE)
{
BIND_ACTION_OK(cbs, action_ok_file_load_with_detect_core_carchive);
}
@ -3192,8 +3192,8 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
break;
}
break;
case MENU_FILE_MOVIE:
case MENU_FILE_MUSIC:
case FILE_TYPE_MOVIE:
case FILE_TYPE_MUSIC:
#ifdef HAVE_FFMPEG
switch (menu_label_hash)
{
@ -3205,7 +3205,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
}
#endif
break;
case MENU_FILE_IMAGEVIEWER:
case FILE_TYPE_IMAGEVIEWER:
switch (menu_label_hash)
{
case MENU_LABEL_SCAN_FILE:

60
menu/cbs/menu_cbs_right.c
View File

@ -444,36 +444,36 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
case MENU_SETTINGS_CORE_DISK_OPTIONS_DISK_INDEX:
BIND_ACTION_RIGHT(cbs, disk_options_disk_idx_right);
break;
case MENU_FILE_PLAIN:
case MENU_FILE_DIRECTORY:
case MENU_FILE_PARENT_DIRECTORY:
case MENU_FILE_CARCHIVE:
case MENU_FILE_IN_CARCHIVE:
case MENU_FILE_CORE:
case MENU_FILE_RDB:
case MENU_FILE_RDB_ENTRY:
case MENU_FILE_RPL_ENTRY:
case MENU_FILE_CURSOR:
case MENU_FILE_SHADER:
case MENU_FILE_SHADER_PRESET:
case MENU_FILE_IMAGE:
case MENU_FILE_OVERLAY:
case MENU_FILE_VIDEOFILTER:
case MENU_FILE_AUDIOFILTER:
case MENU_FILE_CONFIG:
case MENU_FILE_USE_DIRECTORY:
case MENU_FILE_PLAYLIST_ENTRY:
case FILE_TYPE_PLAIN:
case FILE_TYPE_DIRECTORY:
case FILE_TYPE_PARENT_DIRECTORY:
case FILE_TYPE_CARCHIVE:
case FILE_TYPE_IN_CARCHIVE:
case FILE_TYPE_CORE:
case FILE_TYPE_RDB:
case FILE_TYPE_RDB_ENTRY:
case FILE_TYPE_RPL_ENTRY:
case FILE_TYPE_CURSOR:
case FILE_TYPE_SHADER:
case FILE_TYPE_SHADER_PRESET:
case FILE_TYPE_IMAGE:
case FILE_TYPE_OVERLAY:
case FILE_TYPE_VIDEOFILTER:
case FILE_TYPE_AUDIOFILTER:
case FILE_TYPE_CONFIG:
case FILE_TYPE_USE_DIRECTORY:
case FILE_TYPE_PLAYLIST_ENTRY:
case MENU_INFO_MESSAGE:
case MENU_FILE_DOWNLOAD_CORE:
case MENU_FILE_CHEAT:
case MENU_FILE_REMAP:
case MENU_FILE_MOVIE:
case MENU_FILE_MUSIC:
case MENU_FILE_IMAGEVIEWER:
case MENU_FILE_PLAYLIST_COLLECTION:
case MENU_FILE_DOWNLOAD_CORE_CONTENT:
case MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT:
case MENU_FILE_SCAN_DIRECTORY:
case FILE_TYPE_DOWNLOAD_CORE:
case FILE_TYPE_CHEAT:
case FILE_TYPE_REMAP:
case FILE_TYPE_MOVIE:
case FILE_TYPE_MUSIC:
case FILE_TYPE_IMAGEVIEWER:
case FILE_TYPE_PLAYLIST_COLLECTION:
case FILE_TYPE_DOWNLOAD_CORE_CONTENT:
case FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT:
case FILE_TYPE_SCAN_DIRECTORY:
case MENU_SETTING_GROUP:
if ( string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_HISTORY_TAB)) ||
string_is_equal(menu_label, msg_hash_to_str(MENU_ENUM_LABEL_PLAYLISTS_TAB)) ||
@ -488,7 +488,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
BIND_ACTION_RIGHT(cbs, action_right_scroll);
break;
case MENU_SETTING_ACTION:
case MENU_FILE_CONTENTLIST_ENTRY:
case FILE_TYPE_CONTENTLIST_ENTRY:
BIND_ACTION_RIGHT(cbs, action_right_mainmenu);
break;
default:

10
menu/cbs/menu_cbs_scan.c
View File

@ -113,19 +113,19 @@ static int menu_cbs_init_bind_scan_compare_type(menu_file_list_cbs_t *cbs,
switch (type)
{
#ifdef HAVE_LIBRETRODB
case MENU_FILE_DIRECTORY:
case FILE_TYPE_DIRECTORY:
BIND_ACTION_SCAN(cbs, action_scan_directory);
return 0;
case MENU_FILE_CARCHIVE:
case MENU_FILE_PLAIN:
case FILE_TYPE_CARCHIVE:
case FILE_TYPE_PLAIN:
BIND_ACTION_SCAN(cbs, action_scan_file);
return 0;
#endif
case MENU_FILE_RPL_ENTRY:
case FILE_TYPE_RPL_ENTRY:
BIND_ACTION_SCAN(cbs, action_switch_thumbnail);
break;
case MENU_FILE_NONE:
case FILE_TYPE_NONE:
default:
break;
}

4
menu/cbs/menu_cbs_select.c
View File

@ -164,10 +164,10 @@ static int menu_cbs_init_bind_select_compare_type(
{
switch (type)
{
case MENU_FILE_DIRECTORY:
case FILE_TYPE_DIRECTORY:
BIND_ACTION_SELECT(cbs, action_select_directory);
break;
case MENU_FILE_USE_DIRECTORY:
case FILE_TYPE_USE_DIRECTORY:
BIND_ACTION_SELECT(cbs, action_select_path_use_directory);
break;
default:

24
menu/drivers/materialui.c
View File

@ -551,24 +551,24 @@ static void mui_render_label_value(mui_handle_t *mui,
{
switch (msg_hash_to_file_type(msg_hash_calculate(value)))
{
case MENU_FILE_COMPRESSED:
case MENU_FILE_MORE:
case MENU_FILE_CORE:
case MENU_FILE_RDB:
case MENU_FILE_CURSOR:
case MENU_FILE_PLAIN:
case MENU_FILE_DIRECTORY:
case MENU_FILE_MUSIC:
case MENU_FILE_IMAGE:
case MENU_FILE_MOVIE:
case FILE_TYPE_COMPRESSED:
case FILE_TYPE_MORE:
case FILE_TYPE_CORE:
case FILE_TYPE_RDB:
case FILE_TYPE_CURSOR:
case FILE_TYPE_PLAIN:
case FILE_TYPE_DIRECTORY:
case FILE_TYPE_MUSIC:
case FILE_TYPE_IMAGE:
case FILE_TYPE_MOVIE:
break;
case MENU_FILE_BOOL_ON:
case FILE_TYPE_BOOL_ON:
if (mui->textures.list[MUI_TEXTURE_SWITCH_ON])
texture_switch = mui->textures.list[MUI_TEXTURE_SWITCH_ON];
else
do_draw_text = true;
break;
case MENU_FILE_BOOL_OFF:
case FILE_TYPE_BOOL_OFF:
if (mui->textures.list[MUI_TEXTURE_SWITCH_OFF])
texture_switch = mui->textures.list[MUI_TEXTURE_SWITCH_OFF];
else

52
menu/drivers/xmb.c
View File

@ -1271,7 +1271,7 @@ static void xmb_init_horizontal_list(xmb_handle_t *xmb)
info.list = xmb->horizontal_list;
info.menu_list = NULL;
info.type = 0;
info.type_default = MENU_FILE_PLAIN;
info.type_default = FILE_TYPE_PLAIN;
info.flags = SL_FLAG_ALLOW_EMPTY_LIST;
info.enum_idx = MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST;
strlcpy(info.label,
@ -1542,29 +1542,29 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
switch(type)
{
case MENU_FILE_DIRECTORY:
case FILE_TYPE_DIRECTORY:
return xmb->textures.list[XMB_TEXTURE_FOLDER];
case MENU_FILE_PLAIN:
case FILE_TYPE_PLAIN:
return xmb->textures.list[XMB_TEXTURE_FILE];
case MENU_FILE_RPL_ENTRY:
case FILE_TYPE_RPL_ENTRY:
if (core_node)
return core_node->content_icon;
return xmb->textures.list[XMB_TEXTURE_FILE];
case MENU_FILE_CARCHIVE:
case FILE_TYPE_CARCHIVE:
return xmb->textures.list[XMB_TEXTURE_ZIP];
case MENU_FILE_MUSIC:
case FILE_TYPE_MUSIC:
return xmb->textures.list[XMB_TEXTURE_MUSIC];
case MENU_FILE_IMAGEVIEWER:
case FILE_TYPE_IMAGEVIEWER:
return xmb->textures.list[XMB_TEXTURE_IMAGE];
case MENU_FILE_MOVIE:
case FILE_TYPE_MOVIE:
return xmb->textures.list[XMB_TEXTURE_MOVIE];
case MENU_FILE_CORE:
case FILE_TYPE_CORE:
return xmb->textures.list[XMB_TEXTURE_CORE];
case MENU_FILE_RDB:
case FILE_TYPE_RDB:
return xmb->textures.list[XMB_TEXTURE_RDB];
case MENU_FILE_CURSOR:
case FILE_TYPE_CURSOR:
return xmb->textures.list[XMB_TEXTURE_CURSOR];
case MENU_FILE_PLAYLIST_ENTRY:
case FILE_TYPE_PLAYLIST_ENTRY:
case MENU_SETTING_ACTION_RUN:
return xmb->textures.list[XMB_TEXTURE_RUN];
case MENU_SETTING_ACTION_CLOSE:
@ -1573,7 +1573,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
return xmb->textures.list[XMB_TEXTURE_SAVESTATE];
case MENU_SETTING_ACTION_LOADSTATE:
return xmb->textures.list[XMB_TEXTURE_LOADSTATE];
case MENU_FILE_RDB_ENTRY:
case FILE_TYPE_RDB_ENTRY:
case MENU_SETTING_ACTION_CORE_INFORMATION:
return xmb->textures.list[XMB_TEXTURE_CORE_INFO];
case MENU_SETTING_ACTION_CORE_OPTIONS:
@ -1675,7 +1675,7 @@ static void xmb_draw_items(xmb_handle_t *xmb,
menu_entry_get(&entry, 0, i, list, true);
if (entry.type == MENU_FILE_CONTENTLIST_ENTRY)
if (entry.type == FILE_TYPE_CONTENTLIST_ENTRY)
fill_short_pathname_representation(entry.path, entry.path,
sizeof(entry.path));
@ -1700,24 +1700,24 @@ static void xmb_draw_items(xmb_handle_t *xmb,
{
switch (msg_hash_to_file_type(msg_hash_calculate(entry.value)))
{
case MENU_FILE_COMPRESSED:
case MENU_FILE_MORE:
case MENU_FILE_CORE:
case MENU_FILE_RDB:
case MENU_FILE_CURSOR:
case MENU_FILE_PLAIN:
case MENU_FILE_DIRECTORY:
case MENU_FILE_MUSIC:
case MENU_FILE_IMAGE:
case MENU_FILE_MOVIE:
case FILE_TYPE_COMPRESSED:
case FILE_TYPE_MORE:
case FILE_TYPE_CORE:
case FILE_TYPE_RDB:
case FILE_TYPE_CURSOR:
case FILE_TYPE_PLAIN:
case FILE_TYPE_DIRECTORY:
case FILE_TYPE_MUSIC:
case FILE_TYPE_IMAGE:
case FILE_TYPE_MOVIE:
break;
case MENU_FILE_BOOL_ON:
case FILE_TYPE_BOOL_ON:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_ON])
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_ON];
else
do_draw_text = true;
break;
case MENU_FILE_BOOL_OFF:
case FILE_TYPE_BOOL_OFF:
if (xmb->textures.list[XMB_TEXTURE_SWITCH_OFF])
texture_switch = xmb->textures.list[XMB_TEXTURE_SWITCH_OFF];
else

112
menu/menu_displaylist.c
View File

@ -75,7 +75,7 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY),
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
MENU_FILE_NONE, 0, 0);
FILE_TYPE_NONE, 0, 0);
return;
}
@ -107,7 +107,7 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
switch (type)
{
case MENU_FILE_DOWNLOAD_CORE:
case FILE_TYPE_DOWNLOAD_CORE:
{
settings_t *settings = config_get_ptr();
@ -140,7 +140,7 @@ static void print_buf_lines(file_list_t *list, char *buf, int buf_size,
}
break;
default:
case MENU_FILE_NONE:
case FILE_TYPE_NONE:
break;
}
@ -168,7 +168,7 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY),
msg_hash_to_str(MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY),
MENU_ENUM_LABEL_NO_ENTRIES_TO_DISPLAY,
MENU_FILE_NONE, 0, 0);
FILE_TYPE_NONE, 0, 0);
return;
}
@ -216,7 +216,7 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
switch (type)
{
case MENU_FILE_DOWNLOAD_CORE:
case FILE_TYPE_DOWNLOAD_CORE:
{
settings_t *settings = config_get_ptr();
@ -248,7 +248,7 @@ static void print_buf_lines_extended(file_list_t *list, char *buf, int buf_size,
}
}
break;
case MENU_FILE_NONE:
case FILE_TYPE_NONE:
default:
break;
}
@ -1536,13 +1536,13 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
if (!path)
menu_entries_add_enum(info->list, fill_buf, path_playlist,
MSG_UNKNOWN, MENU_FILE_PLAYLIST_ENTRY, 0, i);
MSG_UNKNOWN, FILE_TYPE_PLAYLIST_ENTRY, 0, i);
else if (is_history)
menu_entries_add_enum(info->list, fill_buf,
path, MSG_UNKNOWN, MENU_FILE_RPL_ENTRY, 0, i);
path, MSG_UNKNOWN, FILE_TYPE_RPL_ENTRY, 0, i);
else
menu_entries_add_enum(info->list, label,
path, MSG_UNKNOWN, MENU_FILE_RPL_ENTRY, 0, i);
path, MSG_UNKNOWN, FILE_TYPE_RPL_ENTRY, 0, i);
}
return 0;
@ -1568,7 +1568,7 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET),
msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET),
MENU_ENUM_LABEL_VIDEO_SHADER_PRESET,
MENU_FILE_PATH, 0, 0);
FILE_TYPE_PATH, 0, 0);
menu_entries_add_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS),
msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS),
@ -1791,15 +1791,15 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
switch (msg_hash_to_file_type(msg_hash_calculate(elem1)))
{
case MENU_FILE_CRC:
case FILE_TYPE_CRC:
if (string_is_equal(crc_str, elem0))
match_found = true;
break;
case MENU_FILE_SHA1:
case FILE_TYPE_SHA1:
if (string_is_equal(db_info_entry->sha1, elem0))
match_found = true;
break;
case MENU_FILE_MD5:
case FILE_TYPE_MD5:
if (string_is_equal(db_info_entry->md5, elem0))
match_found = true;
break;
@ -2111,7 +2111,7 @@ static int menu_database_parse_query(file_list_t *list, const char *path,
{
if (!string_is_empty(db_list->list[i].name))
menu_entries_add_enum(list, db_list->list[i].name,
path, MSG_UNKNOWN, MENU_FILE_RDB_ENTRY, 0, 0);
path, MSG_UNKNOWN, FILE_TYPE_RDB_ENTRY, 0, 0);
}
database_info_list_free(db_list);
@ -2731,7 +2731,7 @@ static int menu_displaylist_parse_horizontal_content_actions(
menu_entries_add_enum(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_RUN),
msg_hash_to_str(MENU_ENUM_LABEL_RUN),
MENU_ENUM_LABEL_RUN, MENU_FILE_PLAYLIST_ENTRY, 0, idx);
MENU_ENUM_LABEL_RUN, FILE_TYPE_PLAYLIST_ENTRY, 0, idx);
menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_GET, &playlist);
@ -2748,7 +2748,7 @@ static int menu_displaylist_parse_horizontal_content_actions(
strlcat(db_path, ".rdb", sizeof(db_path));
menu_entries_add_enum(info->list, label,
db_path, MSG_UNKNOWN, MENU_FILE_RDB_ENTRY, 0, idx);
db_path, MSG_UNKNOWN, FILE_TYPE_RDB_ENTRY, 0, idx);
}
return 0;
@ -3099,7 +3099,7 @@ static int menu_displaylist_parse_generic(
{
if (frontend_driver_parse_drive_list(info->list) != 0)
menu_entries_add_enum(info->list, "/", "",
MSG_UNKNOWN, MENU_FILE_DIRECTORY, 0, 0);
MSG_UNKNOWN, FILE_TYPE_DIRECTORY, 0, 0);
return 0;
}
@ -3124,14 +3124,14 @@ static int menu_displaylist_parse_generic(
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY),
msg_hash_to_str(MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY),
MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY,
MENU_FILE_SCAN_DIRECTORY, 0 ,0);
FILE_TYPE_SCAN_DIRECTORY, 0 ,0);
if (push_dir)
menu_entries_prepend(info->list,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY),
msg_hash_to_str(MENU_ENUM_LABEL_USE_THIS_DIRECTORY),
MENU_ENUM_LABEL_USE_THIS_DIRECTORY,
MENU_FILE_USE_DIRECTORY, 0 ,0);
FILE_TYPE_USE_DIRECTORY, 0 ,0);
if (!horizontal && hash_label != MENU_LABEL_CORE_LIST)
{
@ -3144,7 +3144,7 @@ static int menu_displaylist_parse_generic(
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY),
info->path,
MENU_ENUM_LABEL_PARENT_DIRECTORY,
MENU_FILE_PARENT_DIRECTORY, 0, 0);
FILE_TYPE_PARENT_DIRECTORY, 0, 0);
}
}
@ -3194,18 +3194,18 @@ static int menu_displaylist_parse_generic(
bool is_dir;
char label[PATH_MAX_LENGTH] = {0};
const char *path = NULL;
enum menu_file_type file_type = MENU_FILE_NONE;
enum menu_file_type file_type = FILE_TYPE_NONE;
switch (str_list->elems[i].attr.i)
{
case RARCH_DIRECTORY:
file_type = MENU_FILE_DIRECTORY;
file_type = FILE_TYPE_DIRECTORY;
break;
case RARCH_COMPRESSED_ARCHIVE:
file_type = MENU_FILE_CARCHIVE;
file_type = FILE_TYPE_CARCHIVE;
break;
case RARCH_COMPRESSED_FILE_IN_ARCHIVE:
file_type = MENU_FILE_IN_CARCHIVE;
file_type = FILE_TYPE_IN_CARCHIVE;
break;
case RARCH_PLAIN_FILE:
default:
@ -3217,7 +3217,7 @@ static int menu_displaylist_parse_generic(
/* in case of deferred_core_list we have to interpret
* every archive as an archive to disallow instant loading
*/
file_type = MENU_FILE_CARCHIVE;
file_type = FILE_TYPE_CARCHIVE;
break;
}
}
@ -3225,7 +3225,7 @@ static int menu_displaylist_parse_generic(
break;
}
is_dir = (file_type == MENU_FILE_DIRECTORY);
is_dir = (file_type == FILE_TYPE_DIRECTORY);
if (!is_dir)
{
@ -3245,11 +3245,11 @@ static int menu_displaylist_parse_generic(
{
case MENU_LABEL_CONTENT_COLLECTION_LIST:
if (is_dir && !horizontal)
file_type = MENU_FILE_DIRECTORY;
file_type = FILE_TYPE_DIRECTORY;
else if (is_dir && horizontal)
continue;
else
file_type = MENU_FILE_PLAYLIST_COLLECTION;
file_type = FILE_TYPE_PLAYLIST_COLLECTION;
break;
case MENU_LABEL_CORE_LIST:
#ifndef HAVE_DYNAMIC
@ -3269,10 +3269,10 @@ static int menu_displaylist_parse_generic(
}
#endif
/* Compressed cores are unsupported */
if (file_type == MENU_FILE_CARCHIVE)
if (file_type == FILE_TYPE_CARCHIVE)
continue;
file_type = is_dir ? MENU_FILE_DIRECTORY : MENU_FILE_CORE;
file_type = is_dir ? FILE_TYPE_DIRECTORY : FILE_TYPE_CORE;
break;
}
@ -3284,20 +3284,20 @@ static int menu_displaylist_parse_generic(
case RARCH_CONTENT_MOVIE:
#ifdef HAVE_FFMPEG
if (settings->multimedia.builtin_mediaplayer_enable)
file_type = MENU_FILE_MOVIE;
file_type = FILE_TYPE_MOVIE;
#endif
break;
case RARCH_CONTENT_MUSIC:
#ifdef HAVE_FFMPEG
if (settings->multimedia.builtin_mediaplayer_enable)
file_type = MENU_FILE_MUSIC;
file_type = FILE_TYPE_MUSIC;
#endif
break;
case RARCH_CONTENT_IMAGE:
#ifdef HAVE_IMAGEVIEWER
if (settings->multimedia.builtin_imageviewer_enable
&& hash_label != MENU_LABEL_MENU_WALLPAPER)
file_type = MENU_FILE_IMAGEVIEWER;
file_type = FILE_TYPE_IMAGEVIEWER;
#endif
default:
break;
@ -3348,7 +3348,7 @@ static int menu_displaylist_parse_generic(
i, &path, NULL, &type, NULL,
NULL);
if (type != MENU_FILE_CORE)
if (type != FILE_TYPE_CORE)
continue;
fill_pathname_join(core_path, dir, path, sizeof(core_path));
@ -4426,7 +4426,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_CORE_CONTENT:
#ifdef HAVE_NETWORKING
print_buf_lines(info->list, core_buf,
core_len, MENU_FILE_DOWNLOAD_CORE_CONTENT);
core_len, FILE_TYPE_DOWNLOAD_CORE_CONTENT);
info->need_push = true;
info->need_refresh = true;
#endif
@ -4434,7 +4434,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_CORES_UPDATER:
#ifdef HAVE_NETWORKING
print_buf_lines_extended(info->list, core_buf,
core_len, MENU_FILE_DOWNLOAD_CORE);
core_len, FILE_TYPE_DOWNLOAD_CORE);
info->need_push = true;
info->need_refresh = true;
info->need_clear = true;
@ -4443,7 +4443,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_THUMBNAILS_UPDATER:
#ifdef HAVE_NETWORKING
print_buf_lines(info->list, core_buf,
core_len, MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT);
core_len, FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT);
info->need_push = true;
info->need_refresh = true;
info->need_clear = true;
@ -4452,7 +4452,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
case DISPLAYLIST_LAKKA:
#ifdef HAVE_NETWORKING
print_buf_lines(info->list, core_buf,
core_len, MENU_FILE_DOWNLOAD_LAKKA);
core_len, FILE_TYPE_DOWNLOAD_LAKKA);
info->need_push = true;
info->need_refresh = true;
info->need_clear = true;
@ -4615,13 +4615,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
{
case DISPLAYLIST_CORES_COLLECTION_SUPPORTED:
menu_entries_add_enum(info->list, cores_paths->elems[i].data, "",
MSG_UNKNOWN, MENU_FILE_CORE, 0, 0);
MSG_UNKNOWN, FILE_TYPE_CORE, 0, 0);
break;
default:
menu_entries_add_enum(info->list, cores_paths->elems[i].data,
msg_hash_to_str(MENU_ENUM_LABEL_DETECT_CORE_LIST_OK),
MENU_ENUM_LABEL_DETECT_CORE_LIST_OK,
MENU_FILE_CORE, 0, 0);
FILE_TYPE_CORE, 0, 0);
break;
}
@ -4691,7 +4691,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true;
break;
case DISPLAYLIST_DATABASES:
info->type_default = MENU_FILE_RDB;
info->type_default = FILE_TYPE_RDB;
strlcpy(info->exts, "rdb", sizeof(info->exts));
strlcpy(info->path, settings->path.content_database, sizeof(info->path));
break;
@ -4726,69 +4726,69 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
info->need_push = true;
break;
case DISPLAYLIST_DATABASE_CURSORS:
info->type_default = MENU_FILE_CURSOR;
info->type_default = FILE_TYPE_CURSOR;
strlcpy(info->exts, "dbc", sizeof(info->exts));
strlcpy(info->path, settings->directory.cursor, sizeof(info->path));
break;
case DISPLAYLIST_DATABASE_PLAYLISTS:
info->type_default = MENU_FILE_PLAIN;
info->type_default = FILE_TYPE_PLAIN;
strlcpy(info->exts, "lpl", sizeof(info->exts));
break;
case DISPLAYLIST_CORES:
{
char ext_name[PATH_MAX_LENGTH] = {0};
info->type_default = MENU_FILE_PLAIN;
info->type_default = FILE_TYPE_PLAIN;
if (frontend_driver_get_core_extension(ext_name, sizeof(ext_name)))
strlcpy(info->exts, ext_name, sizeof(info->exts));
}
break;
case DISPLAYLIST_CONFIG_FILES:
info->type_default = MENU_FILE_CONFIG;
info->type_default = FILE_TYPE_CONFIG;
strlcpy(info->exts, "cfg", sizeof(info->exts));
break;
case DISPLAYLIST_SHADER_PRESET:
info->type_default = MENU_FILE_SHADER_PRESET;
info->type_default = FILE_TYPE_SHADER_PRESET;
strlcpy(info->exts, "cgp|glslp|slangp", sizeof(info->exts));
break;
case DISPLAYLIST_SHADER_PASS:
info->type_default = MENU_FILE_SHADER;
info->type_default = FILE_TYPE_SHADER;
strlcpy(info->exts, "cg|glsl|slang", sizeof(info->exts));
break;
case DISPLAYLIST_VIDEO_FILTERS:
info->type_default = MENU_FILE_VIDEOFILTER;
info->type_default = FILE_TYPE_VIDEOFILTER;
strlcpy(info->exts, "filt", sizeof(info->exts));
break;
case DISPLAYLIST_IMAGES:
info->type_default = MENU_FILE_IMAGE;
info->type_default = FILE_TYPE_IMAGE;
strlcpy(info->exts, "png|jpg|jpeg|bmp|tga", sizeof(info->exts));
break;
case DISPLAYLIST_AUDIO_FILTERS:
info->type_default = MENU_FILE_AUDIOFILTER;
info->type_default = FILE_TYPE_AUDIOFILTER;
strlcpy(info->exts, "dsp", sizeof(info->exts));
break;
case DISPLAYLIST_CHEAT_FILES:
info->type_default = MENU_FILE_CHEAT;
info->type_default = FILE_TYPE_CHEAT;
strlcpy(info->exts, "cht", sizeof(info->exts));
break;
case DISPLAYLIST_CONTENT_HISTORY:
info->type_default = MENU_FILE_PLAIN;
info->type_default = FILE_TYPE_PLAIN;
strlcpy(info->exts, "lpl", sizeof(info->exts));
break;
case DISPLAYLIST_FONTS:
info->type_default = MENU_FILE_FONT;
info->type_default = FILE_TYPE_FONT;
strlcpy(info->exts, "ttf", sizeof(info->exts));
break;
case DISPLAYLIST_OVERLAYS:
info->type_default = MENU_FILE_OVERLAY;
info->type_default = FILE_TYPE_OVERLAY;
strlcpy(info->exts, "cfg", sizeof(info->exts));
break;
case DISPLAYLIST_RECORD_CONFIG_FILES:
info->type_default = MENU_FILE_RECORD_CONFIG;
info->type_default = FILE_TYPE_RECORD_CONFIG;
strlcpy(info->exts, "cfg", sizeof(info->exts));
break;
case DISPLAYLIST_REMAP_FILES:
info->type_default = MENU_FILE_REMAP;
info->type_default = FILE_TYPE_REMAP;
strlcpy(info->exts, "rmp", sizeof(info->exts));
break;
default:

2
menu/menu_driver.h
View File

@ -173,7 +173,7 @@ enum rarch_menu_ctl_state
enum menu_settings_type
{
MENU_SETTINGS_NONE = MENU_FILE_TYPE_T_LAST + 1,
MENU_SETTINGS_NONE = FILE_TYPE_LAST + 1,
MENU_SETTINGS,
MENU_SETTINGS_TAB,
MENU_HISTORY_TAB,

2
menu/menu_entries.c
View File

@ -272,7 +272,7 @@ static bool menu_entries_elem_is_dir(file_list_t *list,
menu_entries_get_at_offset(list, offset, NULL, NULL, &type, NULL, NULL);
return type == MENU_FILE_DIRECTORY;
return type == FILE_TYPE_DIRECTORY;
}
/**

2
menu/menu_setting.c
View File

@ -2430,7 +2430,7 @@ int menu_setting_set_flags(rarch_setting_t *setting)
case ST_ACTION:
return MENU_SETTING_ACTION;
case ST_PATH:
return MENU_FILE_PATH;
return FILE_TYPE_PATH;
case ST_GROUP:
return MENU_SETTING_GROUP;
case ST_SUB_GROUP:

12
menu/menu_shader.c
View File

@ -86,9 +86,9 @@ void menu_shader_manager_init(menu_handle_t *menu)
switch (msg_hash_to_file_type(msg_hash_calculate(path_get_extension(settings->path.shader))))
{
case MENU_FILE_SHADER_PRESET_GLSLP:
case MENU_FILE_SHADER_PRESET_CGP:
case MENU_FILE_SHADER_PRESET_SLANGP:
case FILE_TYPE_SHADER_PRESET_GLSLP:
case FILE_TYPE_SHADER_PRESET_CGP:
case FILE_TYPE_SHADER_PRESET_SLANGP:
conf = config_file_new(settings->path.shader);
if (conf)
{
@ -101,9 +101,9 @@ void menu_shader_manager_init(menu_handle_t *menu)
config_file_free(conf);
}
break;
case MENU_FILE_SHADER_GLSL:
case MENU_FILE_SHADER_CG:
case MENU_FILE_SHADER_SLANG:
case FILE_TYPE_SHADER_GLSL:
case FILE_TYPE_SHADER_CG:
case FILE_TYPE_SHADER_SLANG:
strlcpy(shader->pass[0].source.path, settings->path.shader,
sizeof(shader->pass[0].source.path));
shader->passes = 1;

88
msg_hash.c
View File

@ -139,102 +139,102 @@ enum menu_file_type msg_hash_to_file_type(uint32_t hash)
case FILE_HASH_ZIP:
case FILE_HASH_ZIP_UPP:
case FILE_HASH_APK:
return MENU_FILE_COMPRESSED;
return FILE_TYPE_COMPRESSED;
case MENU_VALUE_MORE:
return MENU_FILE_MORE;
return FILE_TYPE_MORE;
case MENU_VALUE_CORE:
return MENU_FILE_CORE;
return FILE_TYPE_CORE;
case MENU_VALUE_RDB:
return MENU_FILE_RDB;
return FILE_TYPE_RDB;
case MENU_VALUE_CURSOR:
return MENU_FILE_CURSOR;
return FILE_TYPE_CURSOR;
case MENU_VALUE_FILE:
return MENU_FILE_PLAIN;
return FILE_TYPE_PLAIN;
case MENU_VALUE_DIR:
return MENU_FILE_DIRECTORY;
return FILE_TYPE_DIRECTORY;
case MENU_VALUE_MUSIC:
return MENU_FILE_MUSIC;
return FILE_TYPE_MUSIC;
case MENU_VALUE_IMAGE:
return MENU_FILE_IMAGE;
return FILE_TYPE_IMAGE;
case MENU_VALUE_MOVIE:
return MENU_FILE_MOVIE;
return FILE_TYPE_MOVIE;
case MENU_VALUE_ON:
return MENU_FILE_BOOL_ON;
return FILE_TYPE_BOOL_ON;
case MENU_VALUE_OFF:
return MENU_FILE_BOOL_OFF;
return FILE_TYPE_BOOL_OFF;
case MENU_VALUE_GLSL:
return MENU_FILE_SHADER_GLSL;
return FILE_TYPE_SHADER_GLSL;
case MENU_VALUE_HLSL:
return MENU_FILE_SHADER_HLSL;
return FILE_TYPE_SHADER_HLSL;
case MENU_VALUE_CG:
return MENU_FILE_SHADER_HLSL;
return FILE_TYPE_SHADER_HLSL;
case MENU_VALUE_SLANG:
return MENU_FILE_SHADER_SLANG;
return FILE_TYPE_SHADER_SLANG;
case MENU_VALUE_GLSLP:
return MENU_FILE_SHADER_PRESET_GLSLP;
return FILE_TYPE_SHADER_PRESET_GLSLP;
case MENU_VALUE_HLSLP:
return MENU_FILE_SHADER_PRESET_HLSLP;
return FILE_TYPE_SHADER_PRESET_HLSLP;
case MENU_VALUE_CGP:
return MENU_FILE_SHADER_PRESET_HLSLP;
return FILE_TYPE_SHADER_PRESET_HLSLP;
case MENU_VALUE_SLANGP:
return MENU_FILE_SHADER_PRESET_SLANGP;
return FILE_TYPE_SHADER_PRESET_SLANGP;
case MENU_VALUE_CRC:
return MENU_FILE_CRC;
return FILE_TYPE_CRC;
case MENU_VALUE_SHA1:
return MENU_FILE_SHA1;
return FILE_TYPE_SHA1;
case MENU_VALUE_MD5:
return MENU_FILE_MD5;
return FILE_TYPE_MD5;
#ifdef HAVE_FFMPEG
case MENU_VALUE_FILE_OGM:
return MENU_FILE_OGM;
return FILE_TYPE_OGM;
case MENU_VALUE_FILE_MKV:
return MENU_FILE_MKV;
return FILE_TYPE_MKV;
case MENU_VALUE_FILE_AVI:
return MENU_FILE_AVI;
return FILE_TYPE_AVI;
case MENU_VALUE_FILE_MP4:
return MENU_FILE_MP4;
return FILE_TYPE_MP4;
case MENU_VALUE_FILE_FLV:
return MENU_FILE_FLV;
return FILE_TYPE_FLV;
case MENU_VALUE_FILE_WEBM:
return MENU_FILE_WEBM;
return FILE_TYPE_WEBM;
case MENU_VALUE_FILE_3GP:
return MENU_FILE_3GP;
return FILE_TYPE_3GP;
case MENU_VALUE_FILE_F4F:
return MENU_FILE_F4F;
return FILE_TYPE_F4F;
case MENU_VALUE_FILE_F4V:
return MENU_FILE_F4V;
return FILE_TYPE_F4V;
case MENU_VALUE_FILE_MOV:
return MENU_FILE_MOV;
return FILE_TYPE_MOV;
case MENU_VALUE_FILE_WMV:
return MENU_FILE_WMV;
return FILE_TYPE_WMV;
case MENU_VALUE_FILE_MP3:
return MENU_FILE_MP3;
return FILE_TYPE_MP3;
case MENU_VALUE_FILE_M4A:
return MENU_FILE_M4A;
return FILE_TYPE_M4A;
case MENU_VALUE_FILE_OGG:
return MENU_FILE_OGG;
return FILE_TYPE_OGG;
case MENU_VALUE_FILE_FLAC:
return MENU_FILE_FLAC;
return FILE_TYPE_FLAC;
case MENU_VALUE_FILE_WAV:
return MENU_FILE_WAV;
return FILE_TYPE_WAV;
#endif
#ifdef HAVE_IMAGEVIEWER
case MENU_VALUE_FILE_JPG:
case MENU_VALUE_FILE_JPG_CAPS:
case MENU_VALUE_FILE_JPEG:
case MENU_VALUE_FILE_JPEG_CAPS:
return MENU_FILE_JPEG;
return FILE_TYPE_JPEG;
case MENU_VALUE_FILE_PNG:
case MENU_VALUE_FILE_PNG_CAPS:
return MENU_FILE_PNG;
return FILE_TYPE_PNG;
case MENU_VALUE_FILE_TGA:
return MENU_FILE_TGA;
return FILE_TYPE_TGA;
case MENU_VALUE_FILE_BMP:
return MENU_FILE_BMP;
return FILE_TYPE_BMP;
#endif
default:
break;
}
return MENU_FILE_NONE;
return FILE_TYPE_NONE;
}

150
msg_hash.h
View File

@ -26,84 +26,84 @@ RETRO_BEGIN_DECLS
enum menu_file_type
{
MENU_FILE_NONE = 0,
MENU_FILE_PLAIN,
MENU_FILE_DIRECTORY,
MENU_FILE_PARENT_DIRECTORY,
MENU_FILE_PATH,
MENU_FILE_DEVICE,
MENU_FILE_CORE,
MENU_FILE_PLAYLIST_ENTRY,
MENU_FILE_CONTENTLIST_ENTRY,
MENU_FILE_SHADER_PRESET,
MENU_FILE_SHADER,
MENU_FILE_VIDEOFILTER,
MENU_FILE_AUDIOFILTER,
MENU_FILE_CHEAT,
MENU_FILE_OVERLAY,
MENU_FILE_FONT,
MENU_FILE_CONFIG,
MENU_FILE_USE_DIRECTORY,
MENU_FILE_SCAN_DIRECTORY,
MENU_FILE_CARCHIVE,
MENU_FILE_IN_CARCHIVE,
MENU_FILE_IMAGE,
MENU_FILE_IMAGEVIEWER,
MENU_FILE_REMAP,
MENU_FILE_DOWNLOAD_CORE,
MENU_FILE_DOWNLOAD_CORE_CONTENT,
MENU_FILE_DOWNLOAD_CORE_INFO,
MENU_FILE_DOWNLOAD_THUMBNAIL_CONTENT,
MENU_FILE_DOWNLOAD_LAKKA,
MENU_FILE_RDB,
MENU_FILE_RDB_ENTRY,
MENU_FILE_RPL_ENTRY,
MENU_FILE_CURSOR,
MENU_FILE_BOOL_ON,
MENU_FILE_BOOL_OFF,
MENU_FILE_RECORD_CONFIG,
MENU_FILE_PLAYLIST_COLLECTION,
MENU_FILE_PLAYLIST_ASSOCIATION,
MENU_FILE_MOVIE,
MENU_FILE_MUSIC,
MENU_FILE_SHADER_SLANG,
MENU_FILE_SHADER_GLSL,
MENU_FILE_SHADER_HLSL,
MENU_FILE_SHADER_CG,
MENU_FILE_SHADER_PRESET_GLSLP,
MENU_FILE_SHADER_PRESET_HLSLP,
MENU_FILE_SHADER_PRESET_CGP,
MENU_FILE_SHADER_PRESET_SLANGP,
MENU_FILE_DOWNLOAD_THUMBNAIL,
MENU_FILE_MORE,
MENU_FILE_COMPRESSED,
MENU_FILE_SHA1,
MENU_FILE_MD5,
MENU_FILE_CRC,
FILE_TYPE_NONE = 0,
FILE_TYPE_PLAIN,
FILE_TYPE_DIRECTORY,
FILE_TYPE_PARENT_DIRECTORY,
FILE_TYPE_PATH,
FILE_TYPE_DEVICE,
FILE_TYPE_CORE,
FILE_TYPE_PLAYLIST_ENTRY,
FILE_TYPE_CONTENTLIST_ENTRY,
FILE_TYPE_SHADER_PRESET,
FILE_TYPE_SHADER,
FILE_TYPE_VIDEOFILTER,
FILE_TYPE_AUDIOFILTER,
FILE_TYPE_CHEAT,
FILE_TYPE_OVERLAY,
FILE_TYPE_FONT,
FILE_TYPE_CONFIG,
FILE_TYPE_USE_DIRECTORY,
FILE_TYPE_SCAN_DIRECTORY,
FILE_TYPE_CARCHIVE,
FILE_TYPE_IN_CARCHIVE,
FILE_TYPE_IMAGE,
FILE_TYPE_IMAGEVIEWER,
FILE_TYPE_REMAP,
FILE_TYPE_DOWNLOAD_CORE,
FILE_TYPE_DOWNLOAD_CORE_CONTENT,
FILE_TYPE_DOWNLOAD_CORE_INFO,
FILE_TYPE_DOWNLOAD_THUMBNAIL_CONTENT,
FILE_TYPE_DOWNLOAD_LAKKA,
FILE_TYPE_RDB,
FILE_TYPE_RDB_ENTRY,
FILE_TYPE_RPL_ENTRY,
FILE_TYPE_CURSOR,
FILE_TYPE_BOOL_ON,
FILE_TYPE_BOOL_OFF,
FILE_TYPE_RECORD_CONFIG,
FILE_TYPE_PLAYLIST_COLLECTION,
FILE_TYPE_PLAYLIST_ASSOCIATION,
FILE_TYPE_MOVIE,
FILE_TYPE_MUSIC,
FILE_TYPE_SHADER_SLANG,
FILE_TYPE_SHADER_GLSL,
FILE_TYPE_SHADER_HLSL,
FILE_TYPE_SHADER_CG,
FILE_TYPE_SHADER_PRESET_GLSLP,
FILE_TYPE_SHADER_PRESET_HLSLP,
FILE_TYPE_SHADER_PRESET_CGP,
FILE_TYPE_SHADER_PRESET_SLANGP,
FILE_TYPE_DOWNLOAD_THUMBNAIL,
FILE_TYPE_MORE,
FILE_TYPE_COMPRESSED,
FILE_TYPE_SHA1,
FILE_TYPE_MD5,
FILE_TYPE_CRC,
MENU_FILE_WEBM,
MENU_FILE_F4F,
MENU_FILE_F4V,
MENU_FILE_OGM,
MENU_FILE_MKV,
MENU_FILE_AVI,
MENU_FILE_M4A,
MENU_FILE_3GP,
MENU_FILE_MP4,
MENU_FILE_MP3,
MENU_FILE_FLAC,
MENU_FILE_OGG,
MENU_FILE_FLV,
MENU_FILE_WAV,
MENU_FILE_MOV,
MENU_FILE_WMV,
FILE_TYPE_WEBM,
FILE_TYPE_F4F,
FILE_TYPE_F4V,
FILE_TYPE_OGM,
FILE_TYPE_MKV,
FILE_TYPE_AVI,
FILE_TYPE_M4A,
FILE_TYPE_3GP,
FILE_TYPE_MP4,
FILE_TYPE_MP3,
FILE_TYPE_FLAC,
FILE_TYPE_OGG,
FILE_TYPE_FLV,
FILE_TYPE_WAV,
FILE_TYPE_MOV,
FILE_TYPE_WMV,
MENU_FILE_JPEG,
MENU_FILE_PNG,
MENU_FILE_TGA,
MENU_FILE_BMP,
FILE_TYPE_JPEG,
FILE_TYPE_PNG,
FILE_TYPE_TGA,
FILE_TYPE_BMP,
MENU_FILE_TYPE_T_LAST
FILE_TYPE_LAST
};
enum msg_hash_enums

42
retroarch.c
View File

@ -569,33 +569,33 @@ enum rarch_content_type retroarch_path_is_media_type(const char *path)
switch (msg_hash_to_file_type(msg_hash_calculate(path_get_extension(path))))
{
#ifdef HAVE_FFMPEG
case MENU_FILE_OGM:
case MENU_FILE_MKV:
case MENU_FILE_AVI:
case MENU_FILE_MP4:
case MENU_FILE_FLV:
case MENU_FILE_WEBM:
case MENU_FILE_3GP:
case MENU_FILE_F4F:
case MENU_FILE_F4V:
case MENU_FILE_MOV:
case MENU_FILE_WMV:
case FILE_TYPE_OGM:
case FILE_TYPE_MKV:
case FILE_TYPE_AVI:
case FILE_TYPE_MP4:
case FILE_TYPE_FLV:
case FILE_TYPE_WEBM:
case FILE_TYPE_3GP:
case FILE_TYPE_F4F:
case FILE_TYPE_F4V:
case FILE_TYPE_MOV:
case FILE_TYPE_WMV:
return RARCH_CONTENT_MOVIE;
case MENU_FILE_MP3:
case MENU_FILE_M4A:
case MENU_FILE_OGG:
case MENU_FILE_FLAC:
case MENU_FILE_WAV:
case FILE_TYPE_MP3:
case FILE_TYPE_M4A:
case FILE_TYPE_OGG:
case FILE_TYPE_FLAC:
case FILE_TYPE_WAV:
return RARCH_CONTENT_MUSIC;
#endif
#ifdef HAVE_IMAGEVIEWER
case MENU_FILE_JPEG:
case MENU_FILE_PNG:
case MENU_FILE_TGA:
case MENU_FILE_BMP:
case FILE_TYPE_JPEG:
case FILE_TYPE_PNG:
case FILE_TYPE_TGA:
case FILE_TYPE_BMP:
return RARCH_CONTENT_IMAGE;
#endif
case MENU_FILE_NONE:
case FILE_TYPE_NONE:
default:
break;
}

2
tasks/task_decompress.c
View File

@ -261,7 +261,7 @@ bool task_push_decompress(
/* ZIP or APK only */
if (!path_file_exists(source_file) ||
msg_hash_to_file_type(msg_hash_calculate(path_get_extension(source_file)))
!= MENU_FILE_COMPRESSED)
!= FILE_TYPE_COMPRESSED)
{
RARCH_WARN("[decompress] File '%s' does not exist or is not a compressed file.\n",
source_file);