mirror of
https://github.com/libretro/RetroArch
synced 2025-02-22 03:40:43 +00:00
Don't need sleeping argument anymore for rarch_main_data_iterate
This commit is contained in:
parent
af2efa8a29
commit
da8c36b0c3
@ -733,16 +733,12 @@ static void android_app_entry(void *data)
|
|||||||
#ifndef HAVE_MAIN
|
#ifndef HAVE_MAIN
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
bool sleeping = false;
|
|
||||||
unsigned sleep_ms = 0;
|
unsigned sleep_ms = 0;
|
||||||
ret = rarch_main_iterate(&sleep_ms);
|
ret = rarch_main_iterate(&sleep_ms);
|
||||||
|
|
||||||
if (ret == 1 && sleep_ms > 0)
|
if (ret == 1 && sleep_ms > 0)
|
||||||
{
|
|
||||||
sleeping = true;
|
|
||||||
retro_sleep(sleep_ms);
|
retro_sleep(sleep_ms);
|
||||||
}
|
rarch_main_data_iterate();
|
||||||
rarch_main_data_iterate(sleeping);
|
|
||||||
}while (ret != -1);
|
}while (ret != -1);
|
||||||
|
|
||||||
main_exit(data);
|
main_exit(data);
|
||||||
|
@ -324,16 +324,12 @@ int rarch_main(int argc, char *argv[], void *data)
|
|||||||
#ifndef HAVE_MAIN
|
#ifndef HAVE_MAIN
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
bool sleeping = false;
|
|
||||||
unsigned sleep_ms = 0;
|
unsigned sleep_ms = 0;
|
||||||
ret = rarch_main_iterate(&sleep_ms);
|
ret = rarch_main_iterate(&sleep_ms);
|
||||||
|
|
||||||
if (ret == 1 && sleep_ms > 0)
|
if (ret == 1 && sleep_ms > 0)
|
||||||
{
|
|
||||||
sleeping = true;
|
|
||||||
retro_sleep(sleep_ms);
|
retro_sleep(sleep_ms);
|
||||||
}
|
rarch_main_data_iterate();
|
||||||
rarch_main_data_iterate(sleeping);
|
|
||||||
}while(ret != -1);
|
}while(ret != -1);
|
||||||
|
|
||||||
main_exit(args);
|
main_exit(args);
|
||||||
|
@ -78,7 +78,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
|
|||||||
if (action != MENU_ACTION_NOOP)
|
if (action != MENU_ACTION_NOOP)
|
||||||
ret = menu_entry_action(&entry, idx, action);
|
ret = menu_entry_action(&entry, idx, action);
|
||||||
|
|
||||||
rarch_main_data_iterate(false);
|
rarch_main_data_iterate();
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ void rarch_main_data_deinit(void)
|
|||||||
rarch_task_deinit();
|
rarch_task_deinit();
|
||||||
}
|
}
|
||||||
|
|
||||||
void rarch_main_data_iterate(bool sleeping)
|
void rarch_main_data_iterate(void)
|
||||||
{
|
{
|
||||||
if (data_runloop_msg[0] != '\0')
|
if (data_runloop_msg[0] != '\0')
|
||||||
{
|
{
|
||||||
|
@ -16,7 +16,6 @@
|
|||||||
#ifndef __RETROARCH_DATA_RUNLOOP_H
|
#ifndef __RETROARCH_DATA_RUNLOOP_H
|
||||||
#define __RETROARCH_DATA_RUNLOOP_H
|
#define __RETROARCH_DATA_RUNLOOP_H
|
||||||
|
|
||||||
#include <boolean.h>
|
|
||||||
#include <retro_miscellaneous.h>
|
#include <retro_miscellaneous.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#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_clear_state(void);
|
||||||
|
|
||||||
void rarch_main_data_iterate(bool sleeping);
|
void rarch_main_data_iterate(void);
|
||||||
|
|
||||||
void rarch_main_data_deinit(void);
|
void rarch_main_data_deinit(void);
|
||||||
|
|
||||||
|
@ -226,16 +226,12 @@ static void poll_iteration(void)
|
|||||||
int ret = 0;
|
int ret = 0;
|
||||||
while (ret != -1)
|
while (ret != -1)
|
||||||
{
|
{
|
||||||
bool sleeping = false;
|
|
||||||
unsigned sleep_ms = 0;
|
unsigned sleep_ms = 0;
|
||||||
poll_iteration();
|
poll_iteration();
|
||||||
ret = rarch_main_iterate(&sleep_ms);
|
ret = rarch_main_iterate(&sleep_ms);
|
||||||
if (ret == 1 && sleep_ms > 0)
|
if (ret == 1 && sleep_ms > 0)
|
||||||
{
|
|
||||||
sleeping = true;
|
|
||||||
retro_sleep(sleep_ms);
|
retro_sleep(sleep_ms);
|
||||||
}
|
rarch_main_data_iterate();
|
||||||
rarch_main_data_iterate(sleeping);
|
|
||||||
while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
|
while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -71,16 +71,12 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
|
|||||||
CFRunLoopActivity activity, void *info)
|
CFRunLoopActivity activity, void *info)
|
||||||
{
|
{
|
||||||
bool is_idle;
|
bool is_idle;
|
||||||
bool sleeping = false;
|
|
||||||
unsigned sleep_ms = 0;
|
unsigned sleep_ms = 0;
|
||||||
int ret = rarch_main_iterate(&sleep_ms);
|
int ret = rarch_main_iterate(&sleep_ms);
|
||||||
|
|
||||||
if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
|
if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
|
||||||
{
|
|
||||||
sleeping = true;
|
|
||||||
retro_sleep(sleep_ms);
|
retro_sleep(sleep_ms);
|
||||||
}
|
rarch_main_data_iterate();
|
||||||
rarch_main_data_iterate(sleeping);
|
|
||||||
|
|
||||||
if (ret == -1)
|
if (ret == -1)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user