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

No longer need input_driver_input_state

This commit is contained in:
twinaphex 2019-08-12 18:00:31 +02:00
parent 39a6dce7da
commit f7aebf02c8
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
input/input_driver.h
View File

@ -267,11 +267,6 @@ bool input_driver_grab_mouse(void);
bool input_driver_ungrab_mouse(void); bool input_driver_ungrab_mouse(void);
int16_t input_driver_input_state(
rarch_joypad_info_t joypad_info,
const struct retro_keybind **retro_keybinds,
unsigned port, unsigned device, unsigned index, unsigned id);
float *input_driver_get_float(enum input_action action); float *input_driver_get_float(enum input_action action);
unsigned *input_driver_get_uint(enum input_action action); unsigned *input_driver_get_uint(enum input_action action);

21
retroarch.c
View File

@ -10703,10 +10703,15 @@ static void input_driver_poll(void)
if (joypad_driver) if (joypad_driver)
{ {
int16_t ret = 0;
if (current_input && current_input->input_state)
ret = current_input->input_state(current_input_data, joypad_info[i],
libretro_input_binds,
i, RETRO_DEVICE_JOYPAD, 0, RETRO_DEVICE_ID_JOYPAD_MASK);
for (k = 0; k < RARCH_FIRST_CUSTOM_BIND; k++) for (k = 0; k < RARCH_FIRST_CUSTOM_BIND; k++)
{ {
if (input_driver_input_state(joypad_info[i], libretro_input_binds, if (ret & (1 << k))
i, RETRO_DEVICE_JOYPAD, 0, k) != 0)
{ {
int16_t val = input_joypad_analog( int16_t val = input_joypad_analog(
joypad_driver, joypad_info[i], i, joypad_driver, joypad_info[i], i,
@ -12401,18 +12406,6 @@ static void input_keys_pressed(input_bits_t *p_new_state)
} }
} }
int16_t input_driver_input_state(
rarch_joypad_info_t joypad_info,
const struct retro_keybind **retro_keybinds,
unsigned port, unsigned device, unsigned index, unsigned id)
{
if (current_input && current_input->input_state)
return current_input->input_state(current_input_data, joypad_info,
retro_keybinds,
port, device, index, id);
return 0;
}
void *input_driver_get_data(void) void *input_driver_get_data(void)
{ {
return current_input_data; return current_input_data;