diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c index ea4e0ba99f..3d247a828d 100644 --- a/frontend/drivers/platform_linux.c +++ b/frontend/drivers/platform_linux.c @@ -733,16 +733,12 @@ static void android_app_entry(void *data) #ifndef HAVE_MAIN do { - bool sleeping = false; unsigned sleep_ms = 0; ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - { - sleeping = true; retro_sleep(sleep_ms); - } - rarch_main_data_iterate(sleeping); + rarch_main_data_iterate(); }while (ret != -1); main_exit(data); diff --git a/frontend/frontend.c b/frontend/frontend.c index 4d83c9a52d..f8b69d8c95 100644 --- a/frontend/frontend.c +++ b/frontend/frontend.c @@ -324,16 +324,12 @@ int rarch_main(int argc, char *argv[], void *data) #ifndef HAVE_MAIN do { - bool sleeping = false; unsigned sleep_ms = 0; ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - { - sleeping = true; retro_sleep(sleep_ms); - } - rarch_main_data_iterate(sleeping); + rarch_main_data_iterate(); }while(ret != -1); main_exit(args); diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c index d997ec5905..dedc634dc5 100644 --- a/menu/cbs/menu_cbs_select.c +++ b/menu/cbs/menu_cbs_select.c @@ -78,7 +78,7 @@ static int action_select_default(const char *path, const char *label, unsigned t if (action != MENU_ACTION_NOOP) ret = menu_entry_action(&entry, idx, action); - rarch_main_data_iterate(false); + rarch_main_data_iterate(); return ret; } diff --git a/runloop_data.c b/runloop_data.c index 4c8de7604d..76957ac8c7 100644 --- a/runloop_data.c +++ b/runloop_data.c @@ -31,7 +31,7 @@ void rarch_main_data_deinit(void) rarch_task_deinit(); } -void rarch_main_data_iterate(bool sleeping) +void rarch_main_data_iterate(void) { if (data_runloop_msg[0] != '\0') { diff --git a/runloop_data.h b/runloop_data.h index 86346ec242..ed28825326 100644 --- a/runloop_data.h +++ b/runloop_data.h @@ -16,7 +16,6 @@ #ifndef __RETROARCH_DATA_RUNLOOP_H #define __RETROARCH_DATA_RUNLOOP_H -#include #include #ifdef __cplusplus @@ -27,7 +26,7 @@ typedef int (*transfer_cb_t)(void *data, size_t len); void rarch_main_data_clear_state(void); -void rarch_main_data_iterate(bool sleeping); +void rarch_main_data_iterate(void); void rarch_main_data_deinit(void); diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index a84d99f25e..005ff432bf 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -226,16 +226,12 @@ static void poll_iteration(void) int ret = 0; while (ret != -1) { - bool sleeping = false; unsigned sleep_ms = 0; poll_iteration(); ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && sleep_ms > 0) - { - sleeping = true; retro_sleep(sleep_ms); - } - rarch_main_data_iterate(sleeping); + rarch_main_data_iterate(); while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource); } diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m index c16afc9ebc..6aa1a9b4b0 100644 --- a/ui/drivers/ui_cocoatouch.m +++ b/ui/drivers/ui_cocoatouch.m @@ -71,16 +71,12 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer, CFRunLoopActivity activity, void *info) { bool is_idle; - bool sleeping = false; unsigned sleep_ms = 0; int ret = rarch_main_iterate(&sleep_ms); if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0) - { - sleeping = true; retro_sleep(sleep_ms); - } - rarch_main_data_iterate(sleeping); + rarch_main_data_iterate(); if (ret == -1) {