(Menu) Start refactoring main menu actions

This commit is contained in:
twinaphex 2014-08-27 23:44:23 +02:00
parent 0c91b1a1ba
commit d9a10e9ab2
6 changed files with 728 additions and 682 deletions

View File

@ -165,12 +165,10 @@ void file_list_get_last(const file_list_t *list,
file_list_get_at_offset(list, list->size - 1, path, file_type, setting);
}
void *file_list_get_last_setting(const file_list_t *list, int index)
void *file_list_get_last_setting(const file_list_t *list, int index, void *settings)
{
rarch_setting_t *setting_data = (rarch_setting_t*)setting_data_get_list();
if (setting_data)
return (rarch_setting_t*)setting_data_find_setting(setting_data,
if (settings)
return (rarch_setting_t*)setting_data_find_setting(settings,
list->list[index].label);
return NULL;
}

View File

@ -69,7 +69,8 @@ void file_list_sort_on_alt(file_list_t *list);
bool file_list_search(const file_list_t *list, const char *needle, size_t *index);
void *file_list_get_last_setting(const file_list_t *list, int index);
void *file_list_get_last_setting(const file_list_t *list, int index,
void *settings);
#ifdef __cplusplus
}

File diff suppressed because it is too large Load Diff

View File

@ -124,6 +124,7 @@ enum basic_event
RARCH_CMD_VIDEO_SET_NONBLOCKING_STATE,
RARCH_CMD_VIDEO_SET_ASPECT_RATIO,
RARCH_CMD_RESET_CONTEXT,
RARCH_CMD_QUIT_RETROARCH,
};
enum menu_enums

View File

@ -3364,6 +3364,12 @@ void rarch_main_command(unsigned action)
uninit_drivers();
init_drivers();
break;
case RARCH_CMD_QUIT_RETROARCH:
#ifdef HAVE_MENU
g_extern.lifecycle_state &= ~(1ULL << MODE_MENU);
g_extern.lifecycle_state &= ~(1ULL << MODE_GAME);
#endif
break;
}
}

View File

@ -1350,6 +1350,14 @@ static void general_write_handler(const void *data)
if (!setting)
return;
if (!strcmp(setting->name, "quit_retroarch"))
{
if (*setting->value.boolean)
{
rarch_cmd = RARCH_CMD_QUIT_RETROARCH;
*setting->value.boolean = false;
}
}
if (!strcmp(setting->name, "fps_show"))
g_settings.fps_show = *setting->value.boolean;
else if (!strcmp(setting->name, "pause_nonactive"))