mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 16:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(retroarch.c) Use rarch_system_info_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-06-25 13:17:42 +02:00
parent abb19d7259
commit 3f24248498
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
retroarch.c
View File

@ -904,7 +904,8 @@ static void parse_input(int argc, char *argv[])
static void rarch_init_savefile_paths(void) static void rarch_init_savefile_paths(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr();
event_command(EVENT_CMD_SAVEFILES_DEINIT); event_command(EVENT_CMD_SAVEFILES_DEINIT);
@ -918,7 +919,8 @@ static void rarch_init_savefile_paths(void)
unsigned i, j; unsigned i, j;
const struct retro_subsystem_info *info = const struct retro_subsystem_info *info =
libretro_find_subsystem_info( libretro_find_subsystem_info(
global->system.special, global->system.num_special, system->special,
system->num_special,
global->subsystem); global->subsystem);
/* We'll handle this error gracefully later. */ /* We'll handle this error gracefully later. */
@ -1103,26 +1105,26 @@ void rarch_main_free(void)
static void init_system_info(void) static void init_system_info(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
rarch_system_info_t *info = rarch_system_info_get_ptr(); rarch_system_info_t *system = rarch_system_info_get_ptr();
pretro_get_system_info(&info->info); pretro_get_system_info(&system->info);
if (!info->info.library_name) if (!system->info.library_name)
info->info.library_name = "Unknown"; system->info.library_name = "Unknown";
if (!info->info.library_version) if (!system->info.library_version)
info->info.library_version = "v0"; system->info.library_version = "v0";
#ifndef RARCH_CONSOLE #ifndef RARCH_CONSOLE
snprintf(global->title_buf, sizeof(global->title_buf), snprintf(global->title_buf, sizeof(global->title_buf),
RETRO_FRONTEND " : "); RETRO_FRONTEND " : ");
#endif #endif
strlcat(global->title_buf, info->info.library_name, sizeof(global->title_buf)); strlcat(global->title_buf, system->info.library_name, sizeof(global->title_buf));
strlcat(global->title_buf, " ", sizeof(global->title_buf)); strlcat(global->title_buf, " ", sizeof(global->title_buf));
strlcat(global->title_buf, info->info.library_version, sizeof(global->title_buf)); strlcat(global->title_buf, system->info.library_version, sizeof(global->title_buf));
strlcpy(global->system.valid_extensions, info->info.valid_extensions ? strlcpy(system->valid_extensions, system->info.valid_extensions ?
info->info.valid_extensions : DEFAULT_EXT, system->info.valid_extensions : DEFAULT_EXT,
sizeof(global->system.valid_extensions)); sizeof(system->valid_extensions));
global->system.block_extract = info->info.block_extract; system->block_extract = system->info.block_extract;
} }
/* /*
@ -1367,6 +1369,7 @@ void rarch_main_set_state(unsigned cmd)
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
rarch_system_info_t *system = rarch_system_info_get_ptr();
switch (cmd) switch (cmd)
{ {
@ -1392,9 +1395,9 @@ void rarch_main_set_state(unsigned cmd)
* FIXME: This should probably be moved to menu_common somehow. */ * FIXME: This should probably be moved to menu_common somehow. */
if (global) if (global)
{ {
global->frontend_key_event = global->system.key_event; global->frontend_key_event = system->key_event;
global->system.key_event = menu_input_key_event; system->key_event = menu_input_key_event;
global->system.frame_time_last = 0; system->frame_time_last = 0;
} }
menu_entries_set_refresh(); menu_entries_set_refresh();
@ -1439,13 +1442,13 @@ void rarch_main_set_state(unsigned cmd)
/* Restore libretro keyboard callback. */ /* Restore libretro keyboard callback. */
if (global) if (global)
global->system.key_event = global->frontend_key_event; system->key_event = global->frontend_key_event;
#endif #endif
video_driver_set_texture_enable(false, false); video_driver_set_texture_enable(false, false);
break; break;
case RARCH_ACTION_STATE_QUIT: case RARCH_ACTION_STATE_QUIT:
if (global) if (global)
global->system.shutdown = true; system->shutdown = true;
rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED); rarch_main_set_state(RARCH_ACTION_STATE_MENU_RUNNING_FINISHED);
break; break;
case RARCH_ACTION_STATE_FORCE_QUIT: case RARCH_ACTION_STATE_FORCE_QUIT: