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

Get rid of old_input variable

This commit is contained in:
twinaphex 2017-05-21 21:24:01 +02:00
parent a35e452ec3
commit f8f25602e8
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
input/input_driver.c
View File

@ -667,7 +667,6 @@ static bool input_driver_toggle_button_combo(
*/ */
uint64_t input_menu_keys_pressed( uint64_t input_menu_keys_pressed(
void *data, void *data,
uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
bool runloop_paused, bool runloop_paused,
bool *nonblock_state) bool *nonblock_state)
@ -685,7 +684,7 @@ uint64_t input_menu_keys_pressed(
unsigned max_users = input_driver_max_users; unsigned max_users = input_driver_max_users;
if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb()) if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
return input_keys_pressed(settings, old_input, last_input, return input_keys_pressed(settings, last_input,
runloop_paused, nonblock_state); runloop_paused, nonblock_state);
for (i = 0; i < max_users; i++) for (i = 0; i < max_users; i++)
@ -732,7 +731,7 @@ uint64_t input_menu_keys_pressed(
const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE]; const struct retro_keybind *mtkey = &input_config_binds[0][RARCH_MENU_TOGGLE];
if ( ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) && if ( ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo( input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, old_input)) settings->uints.input_menu_toggle_gamepad_combo, *last_input))
|| input_menu_keys_pressed_internal( || input_menu_keys_pressed_internal(
binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users, binds, settings, joypad_info, RARCH_MENU_TOGGLE, max_users,
mtkey->valid, mtkey->valid,
@ -897,7 +896,6 @@ static INLINE bool input_keys_pressed_internal(
*/ */
uint64_t input_keys_pressed( uint64_t input_keys_pressed(
void *data, void *data,
uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
bool runloop_paused, bool runloop_paused,
bool *nonblock_state) bool *nonblock_state)
@ -957,7 +955,7 @@ uint64_t input_keys_pressed(
if ( if (
((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) && ((settings->uints.input_menu_toggle_gamepad_combo != INPUT_TOGGLE_NONE) &&
input_driver_toggle_button_combo( input_driver_toggle_button_combo(
settings->uints.input_menu_toggle_gamepad_combo, old_input)) settings->uints.input_menu_toggle_gamepad_combo, *last_input))
|| input_keys_pressed_internal(settings, joypad_info, RARCH_MENU_TOGGLE, binds)) || input_keys_pressed_internal(settings, joypad_info, RARCH_MENU_TOGGLE, binds))
ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE); ret |= (UINT64_C(1) << RARCH_MENU_TOGGLE);
#endif #endif

2
input/input_driver.h
View File

@ -265,7 +265,6 @@ int16_t input_state(unsigned port, unsigned device,
uint64_t input_keys_pressed( uint64_t input_keys_pressed(
void *data, void *data,
uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
bool runloop_paused, bool runloop_paused,
bool *nonblock_state); bool *nonblock_state);
@ -273,7 +272,6 @@ uint64_t input_keys_pressed(
#ifdef HAVE_MENU #ifdef HAVE_MENU
uint64_t input_menu_keys_pressed( uint64_t input_menu_keys_pressed(
void *data, void *data,
uint64_t old_input,
uint64_t *last_input, uint64_t *last_input,
bool runloop_paused, bool runloop_paused,
bool *nonblock_state); bool *nonblock_state);

9
retroarch.c
View File

@ -2867,7 +2867,6 @@ int runloop_iterate(unsigned *sleep_ms)
static uint64_t last_input = 0; static uint64_t last_input = 0;
bool input_driver_is_nonblock = false; bool input_driver_is_nonblock = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
uint64_t old_input = last_input;
#ifdef HAVE_MENU #ifdef HAVE_MENU
bool menu_is_alive = menu_driver_is_alive(); bool menu_is_alive = menu_driver_is_alive();
#else #else
@ -2881,11 +2880,13 @@ int runloop_iterate(unsigned *sleep_ms)
current_input = current_input =
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_is_alive ? menu_is_alive ?
input_menu_keys_pressed(settings,old_input, input_menu_keys_pressed(settings,
&last_input, runloop_paused, &last_input,
runloop_paused,
&input_driver_is_nonblock) : &input_driver_is_nonblock) :
#endif #endif
input_keys_pressed(settings, old_input, &last_input, input_keys_pressed(settings,
&last_input,
runloop_paused, runloop_paused,
&input_driver_is_nonblock); &input_driver_is_nonblock);