ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid MODE_INIT step. It's useless.

This commit is contained in:
Themaister 2013-04-28 15:23:57 +02:00
parent b459d59793
commit 13e978a2ed
1 changed files with 72 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
frontend/frontend.c
View File

@ -29,28 +29,15 @@
// We want to use -mconsole in Win32, so we need main().
#endif
int main(int argc, char *argv[])
{
#ifdef HAVE_RARCH_MAIN_IMPLEMENTATION
// Consoles use the higher level API.
return rarch_main(argc, argv);
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
#define HAVE_MENU
#else
#undef HAVE_MENU
#endif
rarch_main_clear_state();
rarch_init_msg_queue();
int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
#ifdef HAVE_RGUI
menu_init();
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
for (;;)
{
if (g_extern.system.shutdown)
break;
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
#ifdef HAVE_MENU
// FIXME: This should probably be in menu_common ...
static void load_menu_game_prepare(void)
{
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW))
{
@ -62,7 +49,6 @@ int main(int argc, char *argv[])
msg_queue_push(g_extern.msg_queue, str, 1, 1);
}
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
if (rgui->history)
{
rom_history_push(rgui->history,
@ -71,7 +57,7 @@ int main(int argc, char *argv[])
rgui->info.library_name);
}
// draw frame for loading message
// Draw frame for loading message
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, rgui->frame_buf_show, MENU_TEXTURE_FULLSCREEN);
@ -80,17 +66,9 @@ int main(int argc, char *argv[])
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, false,
MENU_TEXTURE_FULLSCREEN);
#endif
}
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT);
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
{
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT))
static bool load_menu_game(void)
{
if (g_extern.main_is_init)
rarch_main_deinit();
@ -104,19 +82,55 @@ int main(int argc, char *argv[])
args.rom_path = g_extern.fullpath;
args.libretro_path = g_settings.libretro;
int init_ret = rarch_main_init_wrap(&args);
if (init_ret == 0)
if (rarch_main_init_wrap(&args) == 0)
{
RARCH_LOG("rarch_main_init() succeeded.\n");
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
RARCH_LOG("rarch_main_init_wrap() succeeded.\n");
return true;
}
else
{
RARCH_ERR("rarch_main_init() failed.\n");
return 1;
RARCH_ERR("rarch_main_init_wrap() failed.\n");
return false;
}
}
#endif
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INIT);
int main(int argc, char *argv[])
{
#ifdef HAVE_RARCH_MAIN_IMPLEMENTATION
// Consoles use the higher level API.
return rarch_main(argc, argv);
#else
rarch_main_clear_state();
rarch_init_msg_queue();
int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
#ifdef HAVE_MENU
menu_init();
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
for (;;)
{
if (g_extern.system.shutdown)
break;
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{
load_menu_game_prepare();
// If ROM load fails, we exit RetroArch. On console it might make more sense to go back to menu though ...
if (!load_menu_game())
return 1;
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_LOAD_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_GAME))
{
while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{