From f75f0beb08e6a1e382b534b6488d6639fcea096d Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 13 Feb 2016 05:30:57 +0100 Subject: [PATCH] Add EVENT_CMD_EXEC --- command_event.c | 6 ++++-- command_event.h | 5 ++--- menu/menu_content.c | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/command_event.c b/command_event.c index cb74025b68..cba521383f 100644 --- a/command_event.c +++ b/command_event.c @@ -882,7 +882,7 @@ static void event_main_state(unsigned cmd) RARCH_LOG("%s\n", msg); } -bool event_cmd_exec(void *data) +static bool event_cmd_exec(void *data) { char *fullpath = NULL; @@ -975,7 +975,7 @@ bool event_cmd_ctl(enum event_command cmd, void *data) char *fullpath = NULL; runloop_ctl(RUNLOOP_CTL_GET_CONTENT_PATH, &fullpath); runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, settings->libretro); - event_cmd_exec((void*)fullpath); + event_cmd_ctl(EVENT_CMD_EXEC, (void*)fullpath); event_cmd_ctl(EVENT_CMD_QUIT, NULL); #endif } @@ -1662,6 +1662,8 @@ bool event_cmd_ctl(enum event_command cmd, void *data) case EVENT_CMD_SET_FRAME_LIMIT: runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL); break; + case EVENT_CMD_EXEC: + return event_cmd_exec(data); case EVENT_CMD_NONE: default: return false; diff --git a/command_event.h b/command_event.h index 854931d30f..8db27d32d1 100644 --- a/command_event.h +++ b/command_event.h @@ -204,11 +204,10 @@ enum event_command EVENT_CMD_REMAPPING_INIT, EVENT_CMD_REMAPPING_DEINIT, EVENT_CMD_VOLUME_UP, - EVENT_CMD_VOLUME_DOWN + EVENT_CMD_VOLUME_DOWN, + EVENT_CMD_EXEC }; -bool event_cmd_exec(void *data); - /** * event_command: * @cmd : Command index. diff --git a/menu/menu_content.c b/menu/menu_content.c index 5a02372348..93bca52247 100644 --- a/menu/menu_content.c +++ b/menu/menu_content.c @@ -219,7 +219,7 @@ static bool menu_content_load_from_playlist(void *data) else menu_driver_ctl(RARCH_MENU_CTL_SET_LOAD_NO_CONTENT, NULL); - if (!event_cmd_exec((void*)path)) + if (!event_cmd_ctl(EVENT_CMD_EXEC, (void*)path)) return false; event_cmd_ctl(EVENT_CMD_LOAD_CORE, NULL);