From 7b96cf8db3d4b18cc7a038bc1525b65f1bde9d18 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 4 Mar 2013 13:29:04 +0100 Subject: [PATCH] (Android) Blank in input_poll_func() for HAVE_ASYNC_POLL --- driver_funcs.h | 4 ++++ retroarch.c | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/driver_funcs.h b/driver_funcs.h index c2cadb3526..3d5521f588 100644 --- a/driver_funcs.h +++ b/driver_funcs.h @@ -45,7 +45,11 @@ #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_poll_func() +#else #define input_poll_func() driver.input->poll(driver.input_data) +#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) diff --git a/retroarch.c b/retroarch.c index 3a10090948..dc3345e5d2 100644 --- a/retroarch.c +++ b/retroarch.c @@ -496,9 +496,7 @@ static inline void input_poll_overlay(void) static void input_poll(void) { -#ifndef HAVE_ASYNC_POLL input_poll_func(); -#endif #ifdef HAVE_OVERLAY if (driver.overlay) // Poll overlay state @@ -1955,11 +1953,9 @@ static bool check_fullscreen(void) uninit_drivers(); init_drivers(); -#ifndef HAVE_ASYNC_POLL // Poll input to avoid possibly stale data to corrupt things. if (driver.input) input_poll_func(); -#endif } was_pressed = pressed;