mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Get rid of OPEN_HISTORY enum

Browse Source
This commit is contained in:
twinaphex 2014-09-03 03:16:40 +02:00
parent 7e9f8c9f2c
commit b68b4f13e6
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/menu/backend/menu_common_backend.c
View File

@ -1886,9 +1886,8 @@ static int menu_action_ok(const char *dir,
menu_flush_stack_type(driver.menu->menu_stack, menu_flush_stack_type(driver.menu->menu_stack,
MENU_SETTINGS_SHADER_OPTIONS); MENU_SETTINGS_SHADER_OPTIONS);
} }
else
#endif #endif
if (menu_type == MENU_SETTINGS_DEFERRED_CORE) else if (menu_type == MENU_SETTINGS_DEFERRED_CORE)
{ {
strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro)); strlcpy(g_settings.libretro, path, sizeof(g_settings.libretro));
strlcpy(g_extern.fullpath, driver.menu->deferred_path, strlcpy(g_extern.fullpath, driver.menu->deferred_path,

1
frontend/menu/menu_common.h
View File

@ -106,7 +106,6 @@ typedef enum
MENU_SETTINGS_SHADER_PRESET_SAVE, MENU_SETTINGS_SHADER_PRESET_SAVE,
// settings options are done here too // settings options are done here too
MENU_SETTINGS_OPEN_HISTORY,
MENU_SETTINGS_CORE, MENU_SETTINGS_CORE,
MENU_SETTINGS_CORE_INFO, MENU_SETTINGS_CORE_INFO,
MENU_SETTINGS_DEFERRED_CORE, MENU_SETTINGS_DEFERRED_CORE,

77
frontend/menu/menu_entries.c
View File

@ -103,7 +103,7 @@ int menu_entries_push_list(menu_handle_t *menu,
setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true); setting_data = (rarch_setting_t *)setting_data_get_mainmenu(true);
file_list_clear(list); file_list_clear(list);
add_setting_entry(menu,list,"core_list", MENU_SETTINGS_CORE, setting_data); add_setting_entry(menu,list,"core_list", MENU_SETTINGS_CORE, setting_data);
add_setting_entry(menu,list,"history_list", MENU_SETTINGS_OPEN_HISTORY, setting_data); add_setting_entry(menu,list,"history_list", 0, setting_data);
add_setting_entry(menu,list,"detect_core_list", 0, setting_data); add_setting_entry(menu,list,"detect_core_list", 0, setting_data);
add_setting_entry(menu,list,"load_content", 0, setting_data); add_setting_entry(menu,list,"load_content", 0, setting_data);
add_setting_entry(menu,list,"core_options", MENU_SETTINGS_CORE_OPTIONS, setting_data); add_setting_entry(menu,list,"core_options", MENU_SETTINGS_CORE_OPTIONS, setting_data);
@ -144,40 +144,41 @@ int menu_entries_push_list(menu_handle_t *menu,
add_setting_entry(menu,list,"savestate_auto_save", 0, setting_data); add_setting_entry(menu,list,"savestate_auto_save", 0, setting_data);
add_setting_entry(menu,list,"savestate_auto_load", 0, setting_data); add_setting_entry(menu,list,"savestate_auto_load", 0, setting_data);
} }
else if (!strcmp(label, "history_list"))
{
file_list_clear(list);
list_size = content_playlist_size(g_extern.history);
for (i = 0; i < list_size; i++)
{
char fill_buf[PATH_MAX];
const char *path = NULL;
const char *core_name = NULL;
content_playlist_get_index(g_extern.history, i,
&path, NULL, &core_name);
strlcpy(fill_buf, core_name, sizeof(fill_buf));
if (path)
{
char path_short[PATH_MAX];
fill_pathname(path_short, path_basename(path), "",
sizeof(path_short));
snprintf(fill_buf, sizeof(fill_buf), "%s (%s)",
path_short, core_name);
}
file_list_push(list, fill_buf, "",
MENU_FILE_PLAYLIST_ENTRY, 0);
do_action = true;
}
}
else else
{ {
switch (menu_type) switch (menu_type)
{ {
case MENU_SETTINGS_OPEN_HISTORY:
file_list_clear(list);
list_size = content_playlist_size(g_extern.history);
for (i = 0; i < list_size; i++)
{
char fill_buf[PATH_MAX];
const char *path = NULL;
const char *core_name = NULL;
content_playlist_get_index(g_extern.history, i,
&path, NULL, &core_name);
strlcpy(fill_buf, core_name, sizeof(fill_buf));
if (path)
{
char path_short[PATH_MAX];
fill_pathname(path_short, path_basename(path), "",
sizeof(path_short));
snprintf(fill_buf, sizeof(fill_buf), "%s (%s)",
path_short, core_name);
}
file_list_push(list, fill_buf, "",
MENU_FILE_PLAYLIST_ENTRY, 0);
do_action = true;
}
break;
case MENU_SETTINGS_DEFERRED_CORE: case MENU_SETTINGS_DEFERRED_CORE:
{ {
const core_info_t *info = NULL; const core_info_t *info = NULL;
@ -556,7 +557,7 @@ int menu_entries_push_list(menu_handle_t *menu,
if (do_action) if (do_action)
{ {
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
if (menu_type != MENU_SETTINGS_OPEN_HISTORY) if (strcmp(label, "history_list") != 0)
menu_build_scroll_indices(list); menu_build_scroll_indices(list);
entries_refresh(list); entries_refresh(list);
@ -594,10 +595,12 @@ int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list)
file_list_get_last(menu_list, &dir, &label, &menu_type); file_list_get_last(menu_list, &dir, &label, &menu_type);
if ( #if 0
menu_type == MENU_SETTINGS_DEFERRED_CORE || RARCH_LOG("label: %s\n", label);
menu_type == MENU_SETTINGS_OPEN_HISTORY #endif
)
if (!strcmp(label, "history_list") ||
menu_type == MENU_SETTINGS_DEFERRED_CORE)
return menu_entries_push_list(driver.menu, list, dir, label, menu_type); return menu_entries_push_list(driver.menu, list, dir, label, menu_type);
if (menu_parse_check(label, menu_type) == -1) if (menu_parse_check(label, menu_type) == -1)
@ -799,7 +802,7 @@ int menu_parse_and_resolve(file_list_t *list, file_list_t *menu_list)
} }
driver.menu->scroll_indices_size = 0; driver.menu->scroll_indices_size = 0;
if (menu_type != MENU_SETTINGS_OPEN_HISTORY) if (strcmp(label, "history_list") != 0)
menu_build_scroll_indices(list); menu_build_scroll_indices(list);
entries_refresh(list); entries_refresh(list);