From 63020f42d7d01fe6bbb7bc781a04e8815d642419 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Thu, 11 Apr 2013 17:31:46 +0200 Subject: [PATCH] (Android) Some leftover Android garbage that was never expanded upon - scrub --- driver_funcs.h | 7 ------- frontend/frontend_android.c | 5 +---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/driver_funcs.h b/driver_funcs.h index 9d2236a3d8..5fdbda6502 100644 --- a/driver_funcs.h +++ b/driver_funcs.h @@ -45,13 +45,7 @@ #define video_overlay_interface_func(iface) driver.video->overlay_interface(driver.video_data, iface) #define video_free_func() driver.video->free(driver.video_data) #define input_init_func() driver.input->init() -#ifdef HAVE_ASYNC_POLL -#define input_async_poll_func() driver.input->poll(driver.input_data) -#define input_poll_func() -#else #define input_poll_func() driver.input->poll(driver.input_data) -#define input_async_poll_func() -#endif #define input_input_state_func(retro_keybinds, port, device, index, id) \ driver.input->input_state(driver.input_data, retro_keybinds, port, device, index, id) #define input_free_func() driver.input->free(driver.input_data) @@ -155,7 +149,6 @@ static inline bool input_key_pressed_func(int key) #define gfx_ctx_window_has_focus() (true) #define input_init_func() MAKENAME_INPUT(_input_init)() -#define input_async_poll_func() #define input_poll_func() MAKENAME_INPUT(_input_poll)(driver.input_data) #define input_input_state_func(retro_keybinds, port, device, index, id) \ MAKENAME_INPUT(_input_state)(driver.input_data, retro_keybinds, port, device, index, id) diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c index 4ed9070cd0..8312037aa2 100644 --- a/frontend/frontend_android.c +++ b/frontend/frontend_android.c @@ -230,10 +230,7 @@ begin_loop: audio_start_func(); // Main loop - do - { - input_async_poll_func(); - } while (rarch_main_iterate()); + while (rarch_main_iterate()); if (g_extern.lifecycle_mode_state & (1ULL << MODE_VIDEO_THROTTLE_ENABLE)) audio_stop_func();