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

Small micro-opts to input_state

Browse Source
This commit is contained in:
twinaphex 2017-01-22 16:44:34 +01:00
parent 9523afd53c
commit c283d2cf26
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
input/input_driver.c
View File

@ -335,14 +335,11 @@ void input_poll(void)
int16_t input_state(unsigned port, unsigned device, int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id) unsigned idx, unsigned id)
{ {
rarch_joypad_info_t joypad_info;
int16_t res = 0; int16_t res = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
device &= RETRO_DEVICE_MASK; device &= RETRO_DEVICE_MASK;
joypad_info.axis_threshold = settings->input.axis_threshold;
if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_ON, NULL)) if (bsv_movie_ctl(BSV_MOVIE_CTL_PLAYBACK_ON, NULL))
{ {
int16_t ret; int16_t ret;
@ -384,8 +381,12 @@ int16_t input_state(unsigned port, unsigned device,
if (bind_valid) if (bind_valid)
{ {
rarch_joypad_info_t joypad_info;
joypad_info.axis_threshold = settings->input.axis_threshold;
joypad_info.joy_idx = settings->input.joypad_map[port]; joypad_info.joy_idx = settings->input.joypad_map[port];
joypad_info.auto_binds = settings->input.autoconf_binds[joypad_info.joy_idx]; joypad_info.auto_binds = settings->input.autoconf_binds[joypad_info.joy_idx];
res = current_input->input_state( res = current_input->input_state(
current_input_data, joypad_info, libretro_input_binds, port, device, idx, id); current_input_data, joypad_info, libretro_input_binds, port, device, idx, id);
} }