mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 19:21:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify menu_cbs_ok.c

Browse Source
This commit is contained in:
twinaphex 2016-06-30 18:31:45 +02:00
parent b8f40af467
commit 31056286e8
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
menu/cbs/menu_cbs_ok.c
View File

@ -645,7 +645,6 @@ static int action_ok_playlist_entry_collection(const char *path,
const char *core_name = NULL; const char *core_name = NULL;
playlist_t *tmp_playlist = NULL; playlist_t *tmp_playlist = NULL;
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
content_ctx_info_t content_info = {0};
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
return menu_cbs_exit(); return menu_cbs_exit();
@ -732,17 +731,8 @@ static int action_ok_playlist_entry_collection(const char *path,
playlist_get_index(playlist, playlist_get_index(playlist,
playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL); playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL);
if (!task_push_content_load_default( return generic_action_ok_file_load(core_path, path,
core_path, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU);
path,
&content_info,
CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU,
NULL,
NULL))
return menu_cbs_exit();
return menu_cbs_exit();
} }
static int action_ok_playlist_entry(const char *path, static int action_ok_playlist_entry(const char *path,
@ -760,7 +750,6 @@ static int action_ok_playlist_entry(const char *path,
const char *core_name = NULL; const char *core_name = NULL;
playlist_t *tmp_playlist = NULL; playlist_t *tmp_playlist = NULL;
menu_handle_t *menu = NULL; menu_handle_t *menu = NULL;
content_ctx_info_t content_info = {0};
uint32_t hash_label = msg_hash_calculate(label); uint32_t hash_label = msg_hash_calculate(label);
if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu)) if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
@ -862,15 +851,8 @@ static int action_ok_playlist_entry(const char *path,
playlist_get_index(playlist, playlist_get_index(playlist,
playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL); playlist_info.idx, &path, NULL, NULL, NULL, NULL, NULL);
if (!task_push_content_load_default( generic_action_ok_file_load(core_path, path,
core_path, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU);
path,
&content_info,
CORE_TYPE_PLAIN,
CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU,
NULL,
NULL))
return menu_cbs_exit();
if (is_history) if (is_history)
{ {