From 489b578bf89b749cd50773814b107a4e9af52adf Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 27 Jan 2016 03:31:42 +0100 Subject: [PATCH] rename CORE_CTL_RUN to CORE_CTL_RETRO_RUN --- libretro_version_1.c | 2 +- libretro_version_1.h | 2 +- menu/menu_display.c | 2 +- netplay/netplay_net.c | 2 +- runloop.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libretro_version_1.c b/libretro_version_1.c index 58f5f3b332..954795907e 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -171,7 +171,7 @@ bool core_ctl(enum core_ctl_state state, void *data) { switch (state) { - case CORE_CTL_RUN: + case CORE_CTL_RETRO_RUN: switch (core.poll_type) { case POLL_TYPE_EARLY: diff --git a/libretro_version_1.h b/libretro_version_1.h index 885c2add63..cbe6270b12 100644 --- a/libretro_version_1.h +++ b/libretro_version_1.h @@ -50,7 +50,7 @@ enum core_ctl_state CORE_CTL_SET_CBS_REWIND, /* Runs the core for one frame. */ - CORE_CTL_RUN + CORE_CTL_RETRO_RUN }; typedef struct retro_callbacks diff --git a/menu/menu_display.c b/menu/menu_display.c index 455f89931a..16370141c0 100644 --- a/menu/menu_display.c +++ b/menu/menu_display.c @@ -321,7 +321,7 @@ bool menu_display_ctl(enum menu_display_ctl_state state, void *data) if (!libretro_input_is_blocked) input_driver_ctl(RARCH_INPUT_CTL_SET_LIBRETRO_INPUT_BLOCKED, NULL); - core_ctl(CORE_CTL_RUN, NULL); + core_ctl(CORE_CTL_RETRO_RUN, NULL); input_driver_ctl(RARCH_INPUT_CTL_UNSET_LIBRETRO_INPUT_BLOCKED, NULL); return true; diff --git a/netplay/netplay_net.c b/netplay/netplay_net.c index e1040be713..4d83bf2577 100644 --- a/netplay/netplay_net.c +++ b/netplay/netplay_net.c @@ -77,7 +77,7 @@ static void netplay_net_post_frame(netplay_t *netplay) #if defined(HAVE_THREADS) && !defined(RARCH_CONSOLE) lock_autosave(); #endif - core_ctl(CORE_CTL_RUN, NULL); + core_ctl(CORE_CTL_RETRO_RUN, NULL); #if defined(HAVE_THREADS) && !defined(RARCH_CONSOLE) unlock_autosave(); #endif diff --git a/runloop.c b/runloop.c index 79f90250ba..ac1e7e89db 100644 --- a/runloop.c +++ b/runloop.c @@ -1423,7 +1423,7 @@ int runloop_iterate(unsigned *sleep_ms) !input_driver_ctl(RARCH_INPUT_CTL_IS_NONBLOCK_STATE, NULL)) retro_sleep(settings->video.frame_delay); - core_ctl(CORE_CTL_RUN, NULL); + core_ctl(CORE_CTL_RETRO_RUN, NULL); #ifdef HAVE_CHEEVOS /* Test the achievements. */