ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor more code

This commit is contained in:
twinaphex 2015-05-12 12:32:24 +02:00
parent 5d9b8e4789
commit e2d7139c71
3 changed files with 76 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
menu/menu_displaylist.c
View File

@ -83,8 +83,13 @@ int menu_displaylist_push_list(menu_displaylist_info_t *info, unsigned type)
case DISPLAYLIST_VIDEO_FILTERS:
case DISPLAYLIST_AUDIO_FILTERS:
case DISPLAYLIST_IMAGES:
case DISPLAYLIST_OVERLAYS:
case DISPLAYLIST_FONTS:
case DISPLAYLIST_CHEAT_FILES:
case DISPLAYLIST_REMAP_FILES:
case DISPLAYLIST_RECORD_CONFIG_FILES:
case DISPLAYLIST_CONFIG_FILES:
case DISPLAYLIST_CONTENT_HISTORY:
ret = menu_entries_parse_list(info->list, info->menu_list,
info->path, info->label, info->type,
info->type_default, info->exts, NULL);

5
menu/menu_displaylist.h
View File

@ -42,7 +42,12 @@ enum
DISPLAYLIST_VIDEO_FILTERS,
DISPLAYLIST_CHEAT_FILES,
DISPLAYLIST_REMAP_FILES,
DISPLAYLIST_RECORD_CONFIG_FILES,
DISPLAYLIST_CONFIG_FILES,
DISPLAYLIST_CONTENT_HISTORY,
DISPLAYLIST_IMAGES,
DISPLAYLIST_FONTS,
DISPLAYLIST_OVERLAYS,
};
typedef struct menu_displaylist_info

78
menu/menu_entries_cbs_deferred_push.c
View File

@ -1970,8 +1970,17 @@ static int deferred_push_core_list(void *data, void *userdata,
static int deferred_push_configurations(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_CONFIG, "cfg", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_CONFIG;
strlcpy(info.exts, "cfg", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_CONFIG_FILES);
}
static int deferred_push_video_shader_preset(void *data, void *userdata,
@ -2089,36 +2098,81 @@ static int deferred_push_remap_file_load(void *data, void *userdata,
static int deferred_push_record_configfile(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_RECORD_CONFIG, "cfg", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_RECORD_CONFIG;
strlcpy(info.exts, "cfg", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_RECORD_CONFIG_FILES);
}
static int deferred_push_input_overlay(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_OVERLAY, "cfg", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_OVERLAY;
strlcpy(info.exts, "cfg", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_OVERLAYS);
}
static int deferred_push_input_osk_overlay(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_OVERLAY, "cfg", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_OVERLAY;
strlcpy(info.exts, "cfg", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_OVERLAYS);
}
static int deferred_push_video_font_path(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_FONT, "ttf", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_FONT;
strlcpy(info.exts, "ttf", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_FONTS);
}
static int deferred_push_content_history_path(void *data, void *userdata,
const char *path, const char *label, unsigned type)
{
return menu_entries_parse_list((file_list_t*)data, (file_list_t*)userdata, path, label, type,
MENU_FILE_PLAIN, "cfg", NULL);
menu_displaylist_info_t info = {0};
info.list = (file_list_t*)data;
info.menu_list = (file_list_t*)userdata;
info.type = type;
info.type_default = MENU_FILE_PLAIN;
strlcpy(info.exts, "cfg", sizeof(info.exts));
strlcpy(info.path, path, sizeof(info.path));
strlcpy(info.label, label, sizeof(info.label));
return menu_displaylist_push_list(&info, DISPLAYLIST_CONTENT_HISTORY);
}
static int deferred_push_detect_core_list(void *data, void *userdata,