From fcf2decb2ef280605f93347d60a6ced498f6e053 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 17 May 2016 09:07:41 +0200 Subject: [PATCH] Remove persist argument --- command.c | 1 - frontend/frontend.c | 1 - menu/cbs/menu_cbs_ok.c | 15 ++++++--------- menu/drivers/zarch.c | 2 +- menu/menu_content.c | 1 - retroarch.c | 1 - runloop.c | 1 - tasks/task_content.c | 1 - tasks/tasks_internal.h | 1 - ui/drivers/ui_cocoa.m | 4 +--- ui/drivers/ui_win32.c | 1 - 11 files changed, 8 insertions(+), 21 deletions(-) diff --git a/command.c b/command.c index f8f0465dcd..2ddd44f5cc 100644 --- a/command.c +++ b/command.c @@ -1723,7 +1723,6 @@ bool command_event(enum event_command cmd, void *data) case CMD_EVENT_UNLOAD_CORE: if (!rarch_task_push_content_load_default( NULL, NULL, - true, &content_info, CORE_TYPE_DUMMY, CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE, diff --git a/frontend/frontend.c b/frontend/frontend.c index c1f3fdadde..0d8077a2be 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -128,7 +128,6 @@ int rarch_main(int argc, char *argv[], void *data) if (!rarch_task_push_content_load_default( NULL, NULL, - false, &info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_FROM_CLI, diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index d1f19806f6..0ea67e9c20 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -510,7 +510,7 @@ static int file_load_with_detect_core_wrapper(size_t idx, size_t entry_idx, command_event(CMD_EVENT_LOAD_CORE, NULL); rarch_task_push_content_load_default(NULL, NULL, - false, &content_info, CORE_TYPE_PLAIN, + &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU, NULL, NULL); return 0; @@ -558,7 +558,7 @@ static int action_ok_file_load_detect_core(const char *path, { content_ctx_info_t content_info = {0}; rarch_task_push_content_load_default(path, detect_content_path, - false, &content_info, CORE_TYPE_PLAIN, + &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU, NULL, NULL); @@ -1138,7 +1138,6 @@ static int action_ok_core_load_deferred(const char *path, return menu_cbs_exit(); rarch_task_push_content_load_default(path, menu->deferred_path, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU, @@ -1172,7 +1171,7 @@ static int generic_action_ok_file_load(const char *path, { case ACTION_OK_FFMPEG: rarch_task_push_content_load_default( - NULL, new_path, true, + NULL, new_path, &content_info, action_type, CONTENT_MODE_LOAD_CONTENT_WITH_FFMPEG_CORE_FROM_MENU, @@ -1180,7 +1179,7 @@ static int generic_action_ok_file_load(const char *path, break; case ACTION_OK_IMAGEVIEWER: rarch_task_push_content_load_default( - NULL, new_path, true, + NULL, new_path, &content_info, action_type, CONTENT_MODE_LOAD_CONTENT_WITH_IMAGEVIEWER_CORE_FROM_MENU, @@ -1253,7 +1252,6 @@ static int action_ok_file_load(const char *path, rarch_task_push_content_load_default(NULL, full_path_new, - true, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU, @@ -2062,7 +2060,7 @@ static int action_ok_start_core(const char *path, { content_ctx_info_t content_info = {0}; rarch_task_push_content_load_default(NULL, NULL, - false, &content_info, CORE_TYPE_PLAIN, + &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_NOTHING_WITH_CURRENT_CORE_FROM_MENU, NULL, NULL); } @@ -2145,7 +2143,7 @@ static int action_ok_load_archive(const char *path, command_event(CMD_EVENT_LOAD_CORE, NULL); rarch_task_push_content_load_default( - NULL, detect_content_path, false, + NULL, detect_content_path, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU, NULL, NULL); @@ -2193,7 +2191,6 @@ static int action_ok_load_archive_detect_core(const char *path, case -1: command_event(CMD_EVENT_LOAD_CORE, NULL); rarch_task_push_content_load_default(NULL, NULL, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_MENU, diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index 0a2fac0c23..c882924ff6 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -799,7 +799,7 @@ static int zarch_zui_load_content(zui_t *zui, unsigned i) content_ctx_info_t content_info = {0}; rarch_task_push_content_load_default(zui->pick_cores[i].path, - zui->pick_content, false, + zui->pick_content, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_NEW_CORE_FROM_MENU, diff --git a/menu/menu_content.c b/menu/menu_content.c index 6ffcf07d79..10cbf6150b 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -97,7 +97,6 @@ static bool menu_content_load_from_playlist(menu_content_ctx_playlist_info_t *in if (rarch_task_push_content_load_default( core_path, path, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_FROM_PLAYLIST_FROM_MENU, diff --git a/retroarch.c b/retroarch.c index 2dd9b3ffd3..366b7c4391 100644 --- a/retroarch.c +++ b/retroarch.c @@ -1543,7 +1543,6 @@ bool retroarch_replace_config(char *path) if (!rarch_task_push_content_load_default( NULL, NULL, - true, &content_info, CORE_TYPE_DUMMY, CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE, diff --git a/runloop.c b/runloop.c index ae60585631..3a8937b7d1 100644 --- a/runloop.c +++ b/runloop.c @@ -1244,7 +1244,6 @@ static int runloop_iterate_time_to_exit_load_dummy(void) content_ctx_info_t content_info = {0}; if (!rarch_task_push_content_load_default( NULL, NULL, - true, &content_info, CORE_TYPE_DUMMY, CONTENT_MODE_LOAD_NOTHING_WITH_DUMMY_CORE, diff --git a/tasks/task_content.c b/tasks/task_content.c index 06588daa9a..62e1f11407 100644 --- a/tasks/task_content.c +++ b/tasks/task_content.c @@ -1959,7 +1959,6 @@ static bool command_event_cmd_exec(void *data) bool rarch_task_push_content_load_default( const char *core_path, const char *fullpath, - bool persist, content_ctx_info_t *content_info, enum rarch_core_type type, enum content_mode_load mode, diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h index 212cec54c7..31a45ecfce 100644 --- a/tasks/tasks_internal.h +++ b/tasks/tasks_internal.h @@ -129,7 +129,6 @@ bool rarch_task_push_decompress( bool rarch_task_push_content_load_default( const char *core_path, const char *fullpath, - bool persist, content_ctx_info_t *content_info, enum rarch_core_type type, enum content_mode_load mode, diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index a1ab5c5167..d341528ff6 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -284,7 +284,6 @@ static void poll_iteration(void) rarch_task_push_content_load_default( NULL, __core.UTF8String, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI, @@ -325,7 +324,7 @@ static void open_core_handler(NSOpenPanel *panel, NSInteger result) content_ctx_info_t content_info = {0}; runloop_ctl(RUNLOOP_CTL_CLEAR_CONTENT_PATH, NULL); rarch_task_push_content_load_default( - NULL, NULL, false, + NULL, NULL, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI, @@ -362,7 +361,6 @@ static void open_document_handler(NSOpenPanel *panel, NSInteger result) content_ctx_info_t content_info = {0}; rarch_task_push_content_load_default( NULL, NULL, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI, diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c index b4cba7cfe7..f2cdef3742 100644 --- a/ui/drivers/ui_win32.c +++ b/ui/drivers/ui_win32.c @@ -579,7 +579,6 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam) do_wm_close = true; rarch_task_push_content_load_default( NULL, NULL, - false, &content_info, CORE_TYPE_PLAIN, CONTENT_MODE_LOAD_CONTENT_WITH_CURRENT_CORE_FROM_COMPANION_UI,