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

130
frontend/frontend.c
View File

@ -29,6 +29,72 @@
// We want to use -mconsole in Win32, so we need main(). // We want to use -mconsole in Win32, so we need main().
#endif #endif
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
#define HAVE_MENU
#else
#undef HAVE_MENU
#endif
#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))
{
char tmp[PATH_MAX];
char str[PATH_MAX];
fill_pathname_base(tmp, g_extern.fullpath, sizeof(tmp));
snprintf(str, sizeof(str), "INFO - Loading %s ...", tmp);
msg_queue_push(g_extern.msg_queue, str, 1, 1);
}
if (rgui->history)
{
rom_history_push(rgui->history,
g_extern.fullpath,
g_settings.libretro,
rgui->info.library_name);
}
// 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);
rarch_render_cached_frame();
if (driver.video_poke && driver.video_poke->set_texture_enable)
driver.video_poke->set_texture_enable(driver.video_data, false,
MENU_TEXTURE_FULLSCREEN);
}
static bool load_menu_game(void)
{
if (g_extern.main_is_init)
rarch_main_deinit();
struct rarch_main_wrap args = {0};
args.verbose = g_extern.verbose;
args.config_path = *g_extern.config_path ? g_extern.config_path : NULL;
args.sram_path = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL;
args.state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL;
args.rom_path = g_extern.fullpath;
args.libretro_path = g_settings.libretro;
if (rarch_main_init_wrap(&args) == 0)
{
RARCH_LOG("rarch_main_init_wrap() succeeded.\n");
return true;
}
else
{
RARCH_ERR("rarch_main_init_wrap() failed.\n");
return false;
}
}
#endif
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
#ifdef HAVE_RARCH_MAIN_IMPLEMENTATION #ifdef HAVE_RARCH_MAIN_IMPLEMENTATION
@ -42,7 +108,7 @@ int main(int argc, char *argv[])
int init_ret; int init_ret;
if ((init_ret = rarch_main_init(argc, argv))) return init_ret; if ((init_ret = rarch_main_init(argc, argv))) return init_ret;
#ifdef HAVE_RGUI #ifdef HAVE_MENU
menu_init(); menu_init();
g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME; g_extern.lifecycle_mode_state |= 1ULL << MODE_GAME;
@ -52,72 +118,20 @@ int main(int argc, char *argv[])
break; break;
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_LOAD_GAME))
{ {
if (g_extern.lifecycle_mode_state & (1ULL << MODE_INFO_DRAW)) load_menu_game_prepare();
{
char tmp[PATH_MAX];
char str[PATH_MAX];
fill_pathname_base(tmp, g_extern.fullpath, sizeof(tmp)); // If ROM load fails, we exit RetroArch. On console it might make more sense to go back to menu though ...
snprintf(str, sizeof(str), "INFO - Loading %s...", tmp); if (!load_menu_game())
msg_queue_push(g_extern.msg_queue, str, 1, 1); return 1;
}
#if defined(HAVE_RGUI) || defined(HAVE_RMENU) || defined(HAVE_RMENU_XUI)
if (rgui->history)
{
rom_history_push(rgui->history,
g_extern.fullpath,
g_settings.libretro,
rgui->info.library_name);
}
// 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);
rarch_render_cached_frame();
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_LOAD_GAME);
g_extern.lifecycle_mode_state |= (1ULL << MODE_INIT); g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
} }
else if (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()); while ((g_extern.is_paused && !g_extern.is_oneshot) ? rarch_main_idle_iterate() : rarch_main_iterate());
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME); g_extern.lifecycle_mode_state &= ~(1ULL << MODE_GAME);
} }
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_INIT))
{
if (g_extern.main_is_init)
rarch_main_deinit();
struct rarch_main_wrap args = {0};
args.verbose = g_extern.verbose;
args.config_path = *g_extern.config_path ? g_extern.config_path : NULL;
args.sram_path = *g_extern.savefile_dir ? g_extern.savefile_dir : NULL;
args.state_path = *g_extern.savestate_dir ? g_extern.savestate_dir : NULL;
args.rom_path = g_extern.fullpath;
args.libretro_path = g_settings.libretro;
int init_ret = rarch_main_init_wrap(&args);
if (init_ret == 0)
{
RARCH_LOG("rarch_main_init() succeeded.\n");
g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);
}
else
{
RARCH_ERR("rarch_main_init() failed.\n");
return 1;
}
g_extern.lifecycle_mode_state &= ~(1ULL << MODE_INIT);
}
else if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU)) else if (g_extern.lifecycle_mode_state & (1ULL << MODE_MENU))
{ {
g_extern.lifecycle_mode_state |= 1ULL << MODE_MENU_PREINIT; g_extern.lifecycle_mode_state |= 1ULL << MODE_MENU_PREINIT;