Simplify main loops

This commit is contained in:
twinaphex 2016-09-30 08:15:21 +02:00
parent 55efca9b23
commit 9d3d466092
2 changed files with 11 additions and 9 deletions

View File

@ -370,7 +370,6 @@ static void android_app_entry(void *data)
{
char arguments[] = "retroarch";
char *argv[] = {arguments, NULL};
int ret = 0;
int argc = 1;
if (rarch_main(argc, argv, data) != 0)
@ -379,12 +378,14 @@ static void android_app_entry(void *data)
do
{
unsigned sleep_ms = 0;
ret = runloop_iterate(&sleep_ms);
int ret = runloop_iterate(&sleep_ms);
if (ret == 1 && sleep_ms > 0)
retro_sleep(sleep_ms);
task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
}while (ret != -1);
if (ret == -1)
break;
}while(1);
main_exit(data);
#endif

View File

@ -64,7 +64,9 @@ void main_exit(void *args)
#endif
frontend_driver_deinit(args);
frontend_driver_exitspawn(path_get_ptr(RARCH_PATH_CORE), path_get_ptr_size(RARCH_PATH_CORE));
frontend_driver_exitspawn(
path_get_ptr(RARCH_PATH_CORE),
path_get_ptr_size(RARCH_PATH_CORE));
rarch_ctl(RARCH_CTL_DESTROY, NULL);
@ -91,9 +93,6 @@ void main_exit(void *args)
int rarch_main(int argc, char *argv[], void *data)
{
void *args = (void*)data;
#ifndef HAVE_MAIN
int ret = 0;
#endif
rarch_ctl(RARCH_CTL_PREINIT, NULL);
frontend_driver_init_first(args);
@ -125,12 +124,14 @@ int rarch_main(int argc, char *argv[], void *data)
do
{
unsigned sleep_ms = 0;
ret = runloop_iterate(&sleep_ms);
int ret = runloop_iterate(&sleep_ms);
if (ret == 1 && sleep_ms > 0)
retro_sleep(sleep_ms);
task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
}while(ret != -1);
if (ret == -1)
break;
}while(1);
main_exit(args);
#endif