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

Create rarch_system_info_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-06-25 10:51:05 +02:00
parent e80448eaa6
commit faead5c250
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
retroarch.c
View File

@ -316,13 +316,23 @@ static void set_special_paths(char **argv, unsigned num_content)
sizeof(settings->system_directory)); sizeof(settings->system_directory));
} }
struct retro_system_info *rarch_system_info_get_ptr(void)
{
global_t *global = global_get_ptr();
if (!global)
return NULL;
return &global->system.info;
}
void set_paths_redirect(const char *path) void set_paths_redirect(const char *path)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
uint32_t global_library_name_hash = ((global && global->system.info.library_name && struct retro_system_info *info = rarch_system_info_get_ptr();
(global->system.info.library_name[0] != '\0'))
? djb2_calculate(global->system.info.library_name) : 0); uint32_t global_library_name_hash = ((global && info->library_name &&
(info->library_name[0] != '\0'))
? djb2_calculate(info->library_name) : 0);
if( if(
global_library_name_hash != 0 && global_library_name_hash != 0 &&
@ -335,7 +345,7 @@ void set_paths_redirect(const char *path)
fill_pathname_dir( fill_pathname_dir(
global->savefile_dir, global->savefile_dir,
global->savefile_dir, global->savefile_dir,
global->system.info.library_name, info->library_name,
sizeof(global->savefile_dir)); sizeof(global->savefile_dir));
// if path doesn't exist try to create it, if everything fails revert to the original path // if path doesn't exist try to create it, if everything fails revert to the original path
@ -354,7 +364,7 @@ void set_paths_redirect(const char *path)
sizeof(global->savestate_dir)); sizeof(global->savestate_dir));
fill_pathname_dir(global->savestate_dir, fill_pathname_dir(global->savestate_dir,
global->savestate_dir, global->savestate_dir,
global->system.info.library_name, info->library_name,
sizeof(global->savestate_dir)); sizeof(global->savestate_dir));
/* If path doesn't exist, try to create it. /* If path doesn't exist, try to create it.
@ -1088,11 +1098,11 @@ void rarch_main_free(void)
#define DEFAULT_EXT "" #define DEFAULT_EXT ""
#endif #endif
static void init_system_info(void) static void init_system_info(void)
{ {
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
struct retro_system_info *info = (struct retro_system_info*) struct retro_system_info *info = rarch_system_info_get_ptr();
global ? &global->system.info : NULL;
pretro_get_system_info(info); pretro_get_system_info(info);
@ -1125,9 +1135,8 @@ static void init_system_info(void)
**/ **/
void rarch_verify_api_version(void) void rarch_verify_api_version(void)
{ {
RARCH_LOG("Version of libretro API: %u\n", pretro_api_version()); RARCH_LOG("Version of libretro API: %u\n", pretro_api_version());
RARCH_LOG("Compiled against API: %u\n", RETRO_API_VERSION); RARCH_LOG("Compiled against API: %u\n", RETRO_API_VERSION);
if (pretro_api_version() != RETRO_API_VERSION) if (pretro_api_version() != RETRO_API_VERSION)
RARCH_WARN(RETRO_LOG_LIBRETRO_ABI_BREAK); RARCH_WARN(RETRO_LOG_LIBRETRO_ABI_BREAK);

2
runloop.h
View File

@ -363,6 +363,8 @@ void rarch_main_state_free(void);
void rarch_main_global_free(void); void rarch_main_global_free(void);
struct retro_system_info *rarch_system_info_get_ptr(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif