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

Streamline input_state - hopefully turbo buttons still work

Browse Source
This commit is contained in:
twinaphex 2017-01-23 01:18:08 +01:00
parent c78fd7592a
commit a42f66d629
1 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/input_driver.c
View File

@ -336,7 +336,6 @@ int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
int16_t res = 0; int16_t res = 0;
settings_t *settings = config_get_ptr();
device &= RETRO_DEVICE_MASK; device &= RETRO_DEVICE_MASK;
@ -349,6 +348,11 @@ int16_t input_state(unsigned port, unsigned device,
bsv_movie_ctl(BSV_MOVIE_CTL_SET_END, NULL); bsv_movie_ctl(BSV_MOVIE_CTL_SET_END, NULL);
} }
if ( !input_driver_flushing_input
&& !input_driver_block_libretro_input)
{
settings_t *settings = config_get_ptr();
if (settings->input.remap_binds_enable) if (settings->input.remap_binds_enable)
{ {
switch (device) switch (device)
@ -370,9 +374,6 @@ int16_t input_state(unsigned port, unsigned device,
} }
} }
if ( !input_driver_flushing_input
&& !input_driver_block_libretro_input)
{
if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD))) if (((id < RARCH_FIRST_META_KEY) || (device == RETRO_DEVICE_KEYBOARD)))
{ {
bool bind_valid = libretro_input_binds[port] && libretro_input_binds[port][id].valid; bool bind_valid = libretro_input_binds[port] && libretro_input_binds[port][id].valid;
@ -398,7 +399,6 @@ int16_t input_state(unsigned port, unsigned device,
#ifdef HAVE_NETWORKGAMEPAD #ifdef HAVE_NETWORKGAMEPAD
input_remote_state(&res, port, device, idx, id); input_remote_state(&res, port, device, idx, id);
#endif #endif
}
/* Don't allow turbo for D-pad. */ /* Don't allow turbo for D-pad. */
if (device == RETRO_DEVICE_JOYPAD && (id < RETRO_DEVICE_ID_JOYPAD_UP || if (device == RETRO_DEVICE_JOYPAD && (id < RETRO_DEVICE_ID_JOYPAD_UP ||
@ -425,6 +425,7 @@ int16_t input_state(unsigned port, unsigned device,
< settings->input.turbo_duty_cycle); < settings->input.turbo_duty_cycle);
} }
} }
}
if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_OFF, NULL)) if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_OFF, NULL))
bsv_movie_ctl(BSV_MOVIE_CTL_SET_INPUT, &res); bsv_movie_ctl(BSV_MOVIE_CTL_SET_INPUT, &res);