mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move more settings over to menu_entries_cbs.c

Browse Source
This commit is contained in:
twinaphex 2014-10-12 05:15:36 +02:00
parent 170fbdc494
commit dce09587ba
2 changed files with 49 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,12 +185,7 @@ static int menu_setting_ok_toggle(unsigned type,
if (cbs && cbs->action_ok) if (cbs && cbs->action_ok)
return cbs->action_ok(dir, label, type, driver.menu->selection_ptr); return cbs->action_ok(dir, label, type, driver.menu->selection_ptr);
if ( if (menu_common_type_is(label, type) == MENU_SETTINGS)
menu_common_type_is(label, type) == MENU_SETTINGS ||
!strcmp(label, "core_list") ||
!strcmp(label, "configurations") ||
!strcmp(label, "disk_image_append")
)
{ {
menu_entries_push(driver.menu->menu_stack, menu_entries_push(driver.menu->menu_stack,
dir ? dir : label, label, type, dir ? dir : label, label, type,

48
frontend/menu/menu_entries_cbs.c
View File

@ -521,6 +521,48 @@ static int action_ok_custom_viewport(const char *path,
return 0; return 0;
} }
static int action_ok_core_list(const char *path,
const char *label, unsigned type, size_t index)
{
const char *dir = g_settings.libretro_directory;
if (!driver.menu)
return -1;
menu_entries_push(driver.menu->menu_stack,
dir, label, type,
driver.menu->selection_ptr);
return 0;
}
static int action_ok_disk_image_append_list(const char *path,
const char *label, unsigned type, size_t index)
{
const char *dir = g_settings.menu_content_directory;
if (!driver.menu)
return -1;
menu_entries_push(driver.menu->menu_stack,
dir, label, type,
driver.menu->selection_ptr);
return 0;
}
static int action_ok_configurations_list(const char *path,
const char *label, unsigned type, size_t index)
{
const char *dir = g_settings.menu_config_directory;
if (!driver.menu)
return -1;
menu_entries_push(driver.menu->menu_stack,
dir ? dir : label, label, type,
driver.menu->selection_ptr);
return 0;
}
/* Bind the OK callback function */ /* Bind the OK callback function */
static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs, static int menu_entries_cbs_init_bind_ok(menu_file_list_cbs_t *cbs,
@ -627,6 +669,12 @@ static void menu_entries_cbs_init_bind_ok_toggle(menu_file_list_cbs_t *cbs,
cbs->action_ok = action_ok_shader_apply_changes; cbs->action_ok = action_ok_shader_apply_changes;
else if (!strcmp(label, "video_shader_preset_save_as")) else if (!strcmp(label, "video_shader_preset_save_as"))
cbs->action_ok = action_ok_shader_preset_save_as; cbs->action_ok = action_ok_shader_preset_save_as;
else if (!strcmp(label, "core_list"))
cbs->action_ok = action_ok_core_list;
else if (!strcmp(label, "disk_image_append"))
cbs->action_ok = action_ok_disk_image_append_list;
else if (!strcmp(label, "configurations"))
cbs->action_ok = action_ok_configurations_list;
} }
void menu_entries_cbs_init(void *data, void menu_entries_cbs_init(void *data,