diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c index 6dcac0c4ef..0e726025c2 100644 --- a/input/drivers/android_input.c +++ b/input/drivers/android_input.c @@ -781,9 +781,14 @@ static void android_input_handle_user(void *data) static void android_input_poll(void *data) { int ident; + driver_t *driver = driver_get_ptr(); + const input_driver_t *input = driver ? (const input_driver_t*)driver->input : NULL; + + if (!input) + return; while ((ident = - ALooper_pollAll((input_driver_key_pressed(RARCH_PAUSE_TOGGLE)) + ALooper_pollAll((input->key_pressed(driver->input_data, RARCH_PAUSE_TOGGLE)) ? -1 : 0, NULL, NULL, NULL)) >= 0) { diff --git a/input/input_driver.c b/input/input_driver.c index 4a2b98db73..9a135977a3 100644 --- a/input/input_driver.c +++ b/input/input_driver.c @@ -199,17 +199,6 @@ bool input_driver_set_rumble_state(unsigned port, return false; } - -bool input_driver_key_pressed(int key) -{ - driver_t *driver = driver_get_ptr(); - const input_driver_t *input = input_get_ptr(driver); - - if (!driver || !input) - return false; - return input->key_pressed(driver->input_data, key); -} - retro_input_t input_driver_keys_pressed(void) { int key; diff --git a/input/input_driver.h b/input/input_driver.h index e923cd59fb..2d22e5bbc7 100644 --- a/input/input_driver.h +++ b/input/input_driver.h @@ -144,8 +144,6 @@ retro_input_t input_driver_keys_pressed(void); int16_t input_driver_state(const struct retro_keybind **retro_keybinds, unsigned port, unsigned device, unsigned index, unsigned id); -bool input_driver_key_pressed(int key); - uint64_t input_driver_get_capabilities(void); const input_device_driver_t * input_driver_get_joypad_driver(void); diff --git a/runloop.c b/runloop.c index b200be45cc..a37b89f07c 100644 --- a/runloop.c +++ b/runloop.c @@ -754,7 +754,8 @@ static INLINE retro_input_t input_keys_pressed(driver_t *driver, global->turbo_count++; driver->block_libretro_input = check_block_hotkey(driver, - settings, input_driver_key_pressed(RARCH_ENABLE_HOTKEY)); + settings, driver->input->key_pressed( + driver->input_data, RARCH_ENABLE_HOTKEY)); for (i = 0; i < settings->input.max_users; i++) {