mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-20 15:40:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split up rarch_main_data_iterate outside of rarch_main_iterate

Browse Source
This commit is contained in:
twinaphex 2015-05-16 17:00:50 +02:00
parent 085297f2d7
commit 74ee699d5c
6 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/drivers/platform_android.c
View File

@ -227,11 +227,16 @@ static void android_app_entry(void *data)
{
char *argv[1];
int argc = 0;
int ret = 0;
if (rarch_main(argc, argv, data) != 0)
goto end;
#ifndef HAVE_MAIN
while (rarch_main_iterate() != -1);
do
{
ret = rarch_main_iterate();
rarch_main_data_iterate();
}while (ret != -1);
main_exit(data);
#endif

5
frontend/drivers/platform_emscripten.c
View File

@ -21,10 +21,13 @@
#include "../../content.h"
#include "../frontend.h"
#include "../frontend_driver.h"
#include "../runloop_data.h"
static void emscripten_mainloop(void)
{
if (rarch_main_iterate() != -1)
int ret = rarch_main_iterate();
rarch_main_data_iterate();
if (ret != -1)
return;
main_exit(NULL);

6
frontend/frontend.c
View File

@ -20,6 +20,7 @@
#include "../general.h"
#include "../retroarch.h"
#include "../runloop.h"
#include "../runloop_data.h"
#include <file/file_path.h>
#define MAX_ARGS 32
@ -321,7 +322,10 @@ int rarch_main(int argc, char *argv[], void *data)
}
#ifndef HAVE_MAIN
while (rarch_main_iterate() != -1);
do{
ret = rarch_main_iterate();
rarch_main_data_iterate();
}while(ret != -1);
main_exit(args);
#endif

2
runloop.c
View File

@ -1111,8 +1111,6 @@ int rarch_main_iterate(void)
rarch_main_iterate_linefeed_overlay();
#endif
rarch_main_data_iterate();
#ifdef HAVE_MENU
if (runloop->is_menu)
{

2
ui/drivers/ui_cocoa.m
View File

@ -27,6 +27,7 @@
#include "../ui_companion_driver.h"
#include "../../input/drivers/cocoa_input.h"
#include "../../frontend/frontend.h"
#include "../../runloop_data.h"
static id apple_platform;
@ -207,6 +208,7 @@ static void poll_iteration(void)
{
poll_iteration();
ret = rarch_main_iterate();
rarch_main_data_iterate();
while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
}

2
ui/drivers/ui_cocoatouch.m
View File

@ -33,6 +33,7 @@
#include "../../input/drivers_hid/btstack_hid.h"
#include "../../frontend/frontend.h"
#include "../../runloop_data.h"
static id apple_platform;
static CFRunLoopObserverRef iterate_observer;
@ -51,6 +52,7 @@ static void rarch_draw(CFRunLoopObserverRef observer,
return;
ret = rarch_main_iterate();
rarch_main_data_iterate();
if (ret == -1)
{