mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor this

Browse Source
This commit is contained in:
twinaphex 2019-07-16 10:52:33 +02:00
parent 0862700577
commit 32add9c3c2
1 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
retroarch.c
View File

@ -4739,82 +4739,80 @@ static bool secondary_core_create(void)
return false; return false;
/* Load Core */ /* Load Core */
if (init_libretro_symbols_custom( if (!init_libretro_symbols_custom(
CORE_TYPE_PLAIN, &secondary_core, CORE_TYPE_PLAIN, &secondary_core,
secondary_library_path, &secondary_module)) secondary_library_path, &secondary_module))
{ return false;
secondary_core.symbols_inited = true;
secondary_core.retro_set_environment( secondary_core.symbols_inited = true;
rarch_environment_secondary_core_hook); secondary_core.retro_set_environment(
rarch_environment_secondary_core_hook);
#ifdef HAVE_RUNAHEAD #ifdef HAVE_RUNAHEAD
has_variable_update = true; has_variable_update = true;
#endif #endif
secondary_core.retro_init(); secondary_core.retro_init();
content_get_status(&contentless, &is_inited); content_get_status(&contentless, &is_inited);
secondary_core.inited = is_inited; secondary_core.inited = is_inited;
/* Load Content */ /* Load Content */
if (!load_content_info || load_content_info->special) if (!load_content_info || load_content_info->special)
{ {
/* disabled due to crashes */ /* disabled due to crashes */
return false; return false;
#if 0 #if 0
secondary_core.game_loaded = secondary_core.retro_load_game_special( secondary_core.game_loaded = secondary_core.retro_load_game_special(
loadContentInfo.special->id, loadContentInfo.info, loadContentInfo.content->size); loadContentInfo.special->id, loadContentInfo.info, loadContentInfo.content->size);
if (!secondary_core.game_loaded) if (!secondary_core.game_loaded)
{
secondary_core_destroy();
return false;
}
#endif
}
else if (load_content_info->content->size > 0 && load_content_info->content->elems[0].data)
{
secondary_core.game_loaded = secondary_core.retro_load_game(load_content_info->info);
if (!secondary_core.game_loaded)
{
secondary_core_destroy();
return false;
}
}
else if (contentless)
{
secondary_core.game_loaded = secondary_core.retro_load_game(NULL);
if (!secondary_core.game_loaded)
{
secondary_core_destroy();
return false;
}
}
else
secondary_core.game_loaded = false;
if (!secondary_core.inited)
{ {
secondary_core_destroy(); secondary_core_destroy();
return false; return false;
} }
#endif
core_set_default_callbacks(&secondary_callbacks); }
secondary_core.retro_set_video_refresh(secondary_callbacks.frame_cb); else if (load_content_info->content->size > 0 && load_content_info->content->elems[0].data)
secondary_core.retro_set_audio_sample(secondary_callbacks.sample_cb); {
secondary_core.retro_set_audio_sample_batch(secondary_callbacks.sample_batch_cb); secondary_core.game_loaded = secondary_core.retro_load_game(load_content_info->info);
secondary_core.retro_set_input_state(secondary_callbacks.state_cb); if (!secondary_core.game_loaded)
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb);
for (port = 0; port < 16; port++)
{ {
device = port_map[port]; secondary_core_destroy();
if (device >= 0) return false;
secondary_core.retro_set_controller_port_device( }
(unsigned)port, (unsigned)device); }
else if (contentless)
{
secondary_core.game_loaded = secondary_core.retro_load_game(NULL);
if (!secondary_core.game_loaded)
{
secondary_core_destroy();
return false;
} }
clear_controller_port_map();
} }
else else
secondary_core.game_loaded = false;
if (!secondary_core.inited)
{
secondary_core_destroy();
return false; return false;
}
core_set_default_callbacks(&secondary_callbacks);
secondary_core.retro_set_video_refresh(secondary_callbacks.frame_cb);
secondary_core.retro_set_audio_sample(secondary_callbacks.sample_cb);
secondary_core.retro_set_audio_sample_batch(secondary_callbacks.sample_batch_cb);
secondary_core.retro_set_input_state(secondary_callbacks.state_cb);
secondary_core.retro_set_input_poll(secondary_callbacks.poll_cb);
for (port = 0; port < 16; port++)
{
device = port_map[port];
if (device >= 0)
secondary_core.retro_set_controller_port_device(
(unsigned)port, (unsigned)device);
}
clear_controller_port_map();
return true; return true;
} }