libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-10-07 14:23:29 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-21 21:55:20 +02:00
parent 8bf552dacd
commit 77d83b4782
3 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
input/input_driver.c
View File

@ -665,11 +665,7 @@ static bool input_driver_toggle_button_combo(
*
* Returns: Input sample containg a mask of all pressed keys.
*/
uint64_t input_menu_keys_pressed(
void *data,
uint64_t *last_input,
bool runloop_paused,
bool *nonblock_state)
uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input)
{
uint64_t ret = 0;
@ -684,8 +680,7 @@ uint64_t input_menu_keys_pressed(
unsigned max_users = input_driver_max_users;
if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
return input_keys_pressed(settings, last_input,
runloop_paused, nonblock_state);
return input_keys_pressed(settings, last_input);
for (i = 0; i < max_users; i++)
{
@ -807,7 +802,6 @@ uint64_t input_menu_keys_pressed(
}
*last_input = ret;
*nonblock_state = input_driver_nonblock_state;
return ret;
}
@ -881,11 +875,7 @@ static INLINE bool input_keys_pressed_internal(
*
* Returns: Input sample containg a mask of all pressed keys.
*/
uint64_t input_keys_pressed(
void *data,
uint64_t *last_input,
bool runloop_paused,
bool *nonblock_state)
uint64_t input_keys_pressed(void *data, uint64_t *last_input)
{
unsigned i;
rarch_joypad_info_t joypad_info;
@ -955,7 +945,6 @@ uint64_t input_keys_pressed(
}
*last_input = ret;
*nonblock_state = input_driver_nonblock_state;
return ret;
}

12
input/input_driver.h
View File

@ -263,18 +263,10 @@ void input_poll(void);
int16_t input_state(unsigned port, unsigned device,
unsigned idx, unsigned id);
uint64_t input_keys_pressed(
void *data,
uint64_t *last_input,
bool runloop_paused,
bool *nonblock_state);
uint64_t input_keys_pressed(void *data, uint64_t *last_input);
#ifdef HAVE_MENU
uint64_t input_menu_keys_pressed(
void *data,
uint64_t *last_input,
bool runloop_paused,
bool *nonblock_state);
uint64_t input_menu_keys_pressed(void *data, uint64_t *last_input);
#endif
void *input_driver_get_data(void);

22
retroarch.c
View File

@ -2244,7 +2244,7 @@ bool runloop_msg_queue_pull(const char **ret)
static enum runloop_state runloop_check_state(
settings_t *settings,
uint64_t current_input,
bool input_driver_is_nonblock,
bool input_nonblock_state,
bool menu_is_alive,
unsigned *sleep_ms)
{
@ -2605,7 +2605,7 @@ static enum runloop_state runloop_check_state(
if (new_button_state && !old_button_state)
{
if (input_driver_is_nonblock)
if (input_nonblock_state)
input_driver_unset_nonblock_state();
else
input_driver_set_nonblock_state();
@ -2866,8 +2866,8 @@ int runloop_iterate(unsigned *sleep_ms)
{
unsigned i;
retro_time_t current, target, to_sleep_ms;
bool input_nonblock_state = input_driver_is_nonblock_state();
static uint64_t last_input = 0;
bool input_driver_is_nonblock = false;
settings_t *settings = config_get_ptr();
#ifdef HAVE_MENU
bool menu_is_alive = menu_driver_is_alive();
@ -2882,15 +2882,9 @@ int runloop_iterate(unsigned *sleep_ms)
current_input =
#ifdef HAVE_MENU
menu_is_alive ?
input_menu_keys_pressed(settings,
&last_input,
runloop_paused,
&input_driver_is_nonblock) :
input_menu_keys_pressed(settings, &last_input) :
#endif
input_keys_pressed(settings,
&last_input,
runloop_paused,
&input_driver_is_nonblock);
input_keys_pressed(settings, &last_input);
if (input_driver_flushing_input)
{
@ -2912,7 +2906,7 @@ int runloop_iterate(unsigned *sleep_ms)
retro_time_t current = cpu_features_get_time_usec();
retro_time_t delta = current - runloop_frame_time_last;
bool is_locked_fps = (runloop_paused ||
input_driver_is_nonblock) |
input_nonblock_state) |
!!recording_data;
@ -2934,7 +2928,7 @@ int runloop_iterate(unsigned *sleep_ms)
runloop_check_state(
settings,
current_input,
input_driver_is_nonblock,
input_nonblock_state,
menu_is_alive,
sleep_ms))
{
@ -2977,7 +2971,7 @@ int runloop_iterate(unsigned *sleep_ms)
input_push_analog_dpad(auto_binds, dpad_mode);
}
if ((settings->uints.video_frame_delay > 0) && !input_driver_is_nonblock)
if ((settings->uints.video_frame_delay > 0) && !input_nonblock_state)
retro_sleep(settings->uints.video_frame_delay);
core_run();