mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-26 06:40:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1825 from libretro/revert-1824-contextual

Browse Source 
Revert "(XMB) Start re-implementing the Run entry"
This commit is contained in:
Twinaphex 2015-06-18 20:57:04 +02:00
commit 89902543c3
3 changed files with 5 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/cbs/menu_cbs_ok.c
View File

@ -1319,21 +1319,6 @@ static int action_ok_save_new_config(const char *path,
return generic_action_ok_command(EVENT_CMD_MENU_SAVE_CONFIG); return generic_action_ok_command(EVENT_CMD_MENU_SAVE_CONFIG);
} }
static int action_ok_start_content(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)
{
menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu)
return -1;
strlcpy(global->fullpath, menu->deferred_path, sizeof(global->fullpath));
event_command(EVENT_CMD_LOAD_CORE);
rarch_main_set_state(RARCH_ACTION_STATE_LOAD_CONTENT);
return -1;
}
static int action_ok_resume_content(const char *path, static int action_ok_resume_content(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
@ -1540,9 +1525,6 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
case MENU_LABEL_RESUME_CONTENT: case MENU_LABEL_RESUME_CONTENT:
cbs->action_ok = action_ok_resume_content; cbs->action_ok = action_ok_resume_content;
break; break;
case MENU_LABEL_START_CONTENT:
cbs->action_ok = action_ok_start_content;
break;
case MENU_LABEL_RESTART_CONTENT: case MENU_LABEL_RESTART_CONTENT:
cbs->action_ok = action_ok_restart_content; cbs->action_ok = action_ok_restart_content;
break; break;

23
menu/menu_displaylist.c
View File

@ -619,6 +619,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
uint32_t core_name_hash; uint32_t core_name_hash;
char fill_buf[PATH_MAX_LENGTH] = {0}; char fill_buf[PATH_MAX_LENGTH] = {0};
char path_copy[PATH_MAX_LENGTH] = {0}; char path_copy[PATH_MAX_LENGTH] = {0};
bool core_detected = false;
const char *core_name = NULL; const char *core_name = NULL;
const char *db_name = NULL; const char *db_name = NULL;
const char *path = NULL; const char *path = NULL;
@ -651,6 +652,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
char tmp[PATH_MAX_LENGTH] = {0}; char tmp[PATH_MAX_LENGTH] = {0};
snprintf(tmp, sizeof(tmp), " (%s)", core_name); snprintf(tmp, sizeof(tmp), " (%s)", core_name);
strlcat(fill_buf, tmp, sizeof(fill_buf)); strlcat(fill_buf, tmp, sizeof(fill_buf));
core_detected = true;
} }
} }
} }
@ -1312,7 +1314,6 @@ static int menu_displaylist_parse_horizontal_list(menu_displaylist_info_t *info)
fill_pathname_join(path_playlist, fill_pathname_join(path_playlist,
settings->playlist_directory, item->path, settings->playlist_directory, item->path,
sizeof(path_playlist)); sizeof(path_playlist));
menu->playlist = content_playlist_init(path_playlist, menu->playlist = content_playlist_init(path_playlist,
999); 999);
strlcpy(menu->db_playlist_file, path_playlist, sizeof(menu->db_playlist_file)); strlcpy(menu->db_playlist_file, path_playlist, sizeof(menu->db_playlist_file));
@ -1369,7 +1370,6 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
{ {
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
if (!menu) if (!menu)
return -1; return -1;
@ -1393,22 +1393,9 @@ static int menu_displaylist_parse_horizontal_content_actions(menu_displaylist_in
} }
else else
{ {
unsigned idx = 0; // TODO get this value dynamically // TODO Here, push a list of cores instead of run
const char *core_name = NULL; // but display Run if the core is detected in the playlist
const char *core_path = NULL; menu_list_push(info->list, "Run", "", MENU_SETTING_ACTION_RUN, 0, 0);
content_playlist_get_index(menu->playlist, idx,
NULL, NULL, &core_path, &core_name, NULL, NULL);
if (!strcmp(core_name, "DETECT"))
{
menu_list_push(info->list, "TODO: Core selection", "", MENU_SETTING_ACTION_RUN, 0, 0);
}
else
{
strlcpy(settings->libretro, core_path, sizeof(settings->libretro));
menu_list_push(info->list, "Run", "start_content", MENU_SETTING_ACTION_RUN, 0, 0);
}
} }
return 0; return 0;

1
menu/menu_hash.h
View File

@ -380,7 +380,6 @@ extern "C" {
#define MENU_LABEL_CUSTOM_BIND_DEFAULTS 0xe88f7b13U #define MENU_LABEL_CUSTOM_BIND_DEFAULTS 0xe88f7b13U
#define MENU_LABEL_SAVESTATE 0x3a4849b5U #define MENU_LABEL_SAVESTATE 0x3a4849b5U
#define MENU_LABEL_LOADSTATE 0xa39eb286U #define MENU_LABEL_LOADSTATE 0xa39eb286U
#define MENU_LABEL_START_CONTENT 0xdc53686dU
#define MENU_LABEL_RESUME_CONTENT 0xd9f088b0U #define MENU_LABEL_RESUME_CONTENT 0xd9f088b0U
#define MENU_LABEL_VALUE_RESUME 0xce8ac2f6U #define MENU_LABEL_VALUE_RESUME 0xce8ac2f6U
#define MENU_LABEL_RESTART_CONTENT 0x1ea2e224U #define MENU_LABEL_RESTART_CONTENT 0x1ea2e224U