ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

input_state and input_keys_pressed - prevent some more 

function calls
This commit is contained in:
twinaphex 2016-10-20 03:39:32 +02:00
parent ae7ccdfb92
commit e85fca7b75
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
input/input_driver.c
View File

@ -446,8 +446,8 @@ int16_t input_state(unsigned port, unsigned device,
if (settings->input.remap_binds_enable) if (settings->input.remap_binds_enable)
input_remapping_state(port, &device, &idx, &id); input_remapping_state(port, &device, &idx, &id);
if (!input_driver_is_flushing_input() if (!input_driver_flushing_input
&& !input_driver_is_libretro_input_blocked()) && !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)))
res = current_input->input_state( res = current_input->input_state(
@ -582,7 +582,7 @@ retro_input_t input_keys_pressed(void)
input_driver_turbo_btns.frame_enable[i] = 0; input_driver_turbo_btns.frame_enable[i] = 0;
} }
if (!input_driver_is_libretro_input_blocked()) if (!input_driver_block_libretro_input)
{ {
for (i = 0; i < settings->input.max_users; i++) for (i = 0; i < settings->input.max_users; i++)
input_driver_turbo_btns.frame_enable[i] = current_input->input_state( input_driver_turbo_btns.frame_enable[i] = current_input->input_state(
@ -593,8 +593,8 @@ retro_input_t input_keys_pressed(void)
for (key = 0; key < RARCH_BIND_LIST_END; key++) for (key = 0; key < RARCH_BIND_LIST_END; key++)
{ {
bool state = false; bool state = false;
if (((!input_driver_is_libretro_input_blocked() && ((key < RARCH_FIRST_META_KEY))) if (((!input_driver_block_libretro_input && ((key < RARCH_FIRST_META_KEY)))
|| !input_driver_is_hotkey_blocked()) && current_input->key_pressed) || !input_driver_block_hotkey) && current_input->key_pressed)
state = current_input->key_pressed(current_input_data, key); state = current_input->key_pressed(current_input_data, key);
if (key >= RARCH_FIRST_META_KEY) if (key >= RARCH_FIRST_META_KEY)