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

Move core_poll_type to libretro_version_1.c

Browse Source
This commit is contained in:
twinaphex 2016-01-28 06:20:44 +01:00
parent 49ac60767a
commit aad3ddc7a5
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dynamic.h
View File

@ -123,7 +123,6 @@ bool rarch_environment_cb(unsigned cmd, void *data);
struct retro_core_t struct retro_core_t
{ {
unsigned poll_type;
void (*retro_init)(void); void (*retro_init)(void);
void (*retro_deinit)(void); void (*retro_deinit)(void);
unsigned (*retro_api_version)(void); unsigned (*retro_api_version)(void);

13
libretro_version_1.c
View File

@ -38,12 +38,13 @@
#endif #endif
static struct retro_core_t core; static struct retro_core_t core;
static unsigned core_poll_type;
static bool input_polled; static bool input_polled;
static int16_t input_state_poll(unsigned port, static int16_t input_state_poll(unsigned port,
unsigned device, unsigned idx, unsigned id) unsigned device, unsigned idx, unsigned id)
{ {
if (core.poll_type == POLL_TYPE_LATE) if (core_poll_type == POLL_TYPE_LATE)
{ {
if (!input_polled) if (!input_polled)
input_poll(); input_poll();
@ -93,7 +94,7 @@ static bool retro_uninit_libretro_cbs(void *data)
static void input_poll_maybe(void) static void input_poll_maybe(void)
{ {
if (core.poll_type == POLL_TYPE_NORMAL) if (core_poll_type == POLL_TYPE_NORMAL)
input_poll(); input_poll();
} }
@ -127,7 +128,7 @@ static bool retro_init_libretro_cbs(void *data)
return true; return true;
/* Force normal poll type for netplay. */ /* Force normal poll type for netplay. */
core.poll_type = POLL_TYPE_NORMAL; core_poll_type = POLL_TYPE_NORMAL;
if (global->netplay.is_spectate) if (global->netplay.is_spectate)
{ {
@ -192,7 +193,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
case CORE_CTL_SET_POLL_TYPE: case CORE_CTL_SET_POLL_TYPE:
{ {
unsigned *poll_type = (unsigned*)data; unsigned *poll_type = (unsigned*)data;
core.poll_type = *poll_type; core_poll_type = *poll_type;
} }
break; break;
case CORE_CTL_RETRO_SYMBOLS_INIT: case CORE_CTL_RETRO_SYMBOLS_INIT:
@ -314,7 +315,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
core.retro_unload_game(); core.retro_unload_game();
break; break;
case CORE_CTL_RETRO_RUN: case CORE_CTL_RETRO_RUN:
switch (core.poll_type) switch (core_poll_type)
{ {
case POLL_TYPE_EARLY: case POLL_TYPE_EARLY:
input_poll(); input_poll();
@ -333,7 +334,7 @@ bool core_ctl(enum core_ctl_state state, void *data)
case CORE_CTL_INIT: case CORE_CTL_INIT:
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
core.poll_type = settings->input.poll_type_behavior; core_poll_type = settings->input.poll_type_behavior;
if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL)) if (!core_ctl(CORE_CTL_VERIFY_API_VERSION, NULL))
return false; return false;
if (!retro_init_libretro_cbs(&retro_ctx)) if (!retro_init_libretro_cbs(&retro_ctx))