mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(input_driver.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-12-05 05:34:38 +01:00
parent 2ba311274e
commit ecbfc7fd8a
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
input/input_driver.c
View File

@ -306,7 +306,7 @@ bool input_translate_coord_viewport(
return true; return true;
} }
const struct retro_keybind *libretro_input_binds[MAX_USERS]; static const struct retro_keybind *libretro_input_binds[MAX_USERS];
/** /**
* input_poll: * input_poll:
@ -322,27 +322,19 @@ void input_poll(void)
input_driver_turbo_btns.count++; input_driver_turbo_btns.count++;
if (input_driver_block_libretro_input)
{
for (i = 0; i < settings->input.max_users; i++) for (i = 0; i < settings->input.max_users; i++)
{ {
libretro_input_binds[i] = settings->input.binds[i]; libretro_input_binds[i] = settings->input.binds[i];
input_driver_turbo_btns.frame_enable[i] = 0; input_driver_turbo_btns.frame_enable[i] = 0;
} }
}
else
{
const struct retro_keybind *binds[MAX_USERS];
for (i = 0; i < settings->input.max_users; i++) if (!input_driver_block_libretro_input)
{ {
binds[i] = settings->input.binds[i]; for (i = 0; i < settings->input.max_users; i++)
libretro_input_binds[i] = settings->input.binds[i];
input_driver_turbo_btns.frame_enable[i] = current_input->input_state( input_driver_turbo_btns.frame_enable[i] = current_input->input_state(
current_input_data, binds, current_input_data, libretro_input_binds,
i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE); i, RETRO_DEVICE_JOYPAD, 0, RARCH_TURBO_ENABLE);
} }
}
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
if (overlay_ptr) if (overlay_ptr)

2
input/input_driver.h
View File

@ -330,8 +330,6 @@ bool input_driver_ungrab_mouse(void);
bool input_driver_is_data_ptr_same(void *data); bool input_driver_is_data_ptr_same(void *data);
extern const struct retro_keybind *libretro_input_binds[MAX_USERS];
extern input_driver_t input_android; extern input_driver_t input_android;
extern input_driver_t input_sdl; extern input_driver_t input_sdl;
extern input_driver_t input_dinput; extern input_driver_t input_dinput;