mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut down on duplicated code surrounding game options files

Browse Source
This commit is contained in:
twinaphex 2016-01-26 02:24:59 +01:00
parent 04616522b9
commit 2a9b2d7759
4 changed files with 56 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
menu/cbs/menu_cbs_ok.c
View File

@ -1323,55 +1323,6 @@ static int action_ok_disk_cycle_tray_status(const char *path,
return generic_action_ok_command(EVENT_CMD_DISK_EJECT_TOGGLE);
}
bool rarch_option_create(char *path, size_t len)
{
char core_path[PATH_MAX_LENGTH];
char config_directory[PATH_MAX_LENGTH];
const char *core_name = NULL;
const char *game_name = NULL;
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (system)
core_name = system->info.library_name;
if (global)
game_name = path_basename(global->name.base);
if (string_is_empty(core_name) || string_is_empty(game_name))
return false;
/* Config directory: config_directory.
* Try config directory setting first,
* fallback to the location of the current configuration file. */
if (!string_is_empty(settings->menu_config_directory))
strlcpy(config_directory,
settings->menu_config_directory, sizeof(config_directory));
else if (!string_is_empty(global->path.config))
fill_pathname_basedir(config_directory,
global->path.config, sizeof(config_directory));
else
{
RARCH_WARN("Per-game Options: no config directory set\n");
return false;
}
/* Concatenate strings into full paths for game_path */
fill_pathname_join(path,
config_directory, core_name, len);
fill_string_join(path, game_name, len);
strlcat(path, ".opt", len);
fill_pathname_join(core_path,
config_directory, core_name, sizeof(core_path));
if (!path_is_directory(core_path))
path_mkdir(core_path);
return true;
}
/* creates folder and core options stub file for subsequent runs */
static int action_ok_option_create(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx)

48
retroarch.c
View File

@ -1083,6 +1083,54 @@ static bool init_state(void)
return true;
}
bool rarch_option_create(char *path, size_t len)
{
char core_path[PATH_MAX_LENGTH];
char config_directory[PATH_MAX_LENGTH];
const char *core_name = NULL;
const char *game_name = NULL;
global_t *global = global_get_ptr();
settings_t *settings = config_get_ptr();
rarch_system_info_t *system = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (system)
core_name = system->info.library_name;
if (global)
game_name = path_basename(global->name.base);
if (string_is_empty(core_name) || string_is_empty(game_name))
return false;
/* Config directory: config_directory.
* Try config directory setting first,
* fallback to the location of the current configuration file. */
if (!string_is_empty(settings->menu_config_directory))
strlcpy(config_directory,
settings->menu_config_directory, sizeof(config_directory));
else if (!string_is_empty(global->path.config))
fill_pathname_basedir(config_directory,
global->path.config, sizeof(config_directory));
else
{
RARCH_WARN("Per-game Options: no config directory set\n");
return false;
}
/* Concatenate strings into full paths for game_path */
fill_pathname_join(path,
config_directory, core_name, len);
fill_string_join(path, game_name, len);
strlcat(path, ".opt", len);
fill_pathname_join(core_path,
config_directory, core_name, sizeof(core_path));
if (!path_is_directory(core_path))
path_mkdir(core_path);
return true;
}
/**
* rarch_main_init:

2
retroarch.h
View File

@ -193,6 +193,8 @@ enum rarch_content_type rarch_path_is_media_type(const char *path);
const char *rarch_get_current_savefile_dir(void);
bool rarch_option_create(char *path, size_t len);
#ifdef __cplusplus
}
#endif

50
runloop.c
View File

@ -394,58 +394,20 @@ static void check_shader_dir(rarch_dir_list_t *dir_list, bool pressed_next, bool
/**
* rarch_game_specific_options:
* @cmd : Output variable with path to core options file.
*
* Environment callback function implementation.
*
* Returns: true (1) if a game specific core options path has been found,
* Returns: true (1) if a game specific core
* options path has been found,
* otherwise false (0).
**/
static bool rarch_game_specific_options(char **output)
{
char game_path[PATH_MAX_LENGTH];
char config_directory[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
rarch_system_info_t *system = NULL;
const char *core_name = NULL;
const char *game_name = NULL;
config_file_t *option_file = NULL;
runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_GET, &system);
if (system)
core_name = system->info.library_name;
if (global)
game_name = path_basename(global->name.base);
if (string_is_empty(core_name) || string_is_empty(game_name))
return false;
RARCH_LOG("Per-Game Options: core name: %s\n", core_name);
RARCH_LOG("Per-Game Options: game name: %s\n", game_name);
/* Config directory: config_directory.
* Try config directory setting first,
* fallback to the location of the current configuration file. */
if (!string_is_empty(settings->menu_config_directory))
strlcpy(config_directory,
settings->menu_config_directory, sizeof(config_directory));
else if (!string_is_empty(global->path.config))
fill_pathname_basedir(config_directory,
global->path.config, sizeof(config_directory));
else
{
RARCH_WARN("Per-Game Options: no config directory set\n");
return false;
}
/* Concatenate strings into full paths for game_path */
fill_pathname_join(game_path,
config_directory, core_name, sizeof(game_path));
fill_pathname_join(game_path,
game_path, game_name, sizeof(game_path));
strlcat(game_path, ".opt", sizeof(game_path));
config_file_t *option_file = NULL;
if (!rarch_option_create(game_path, sizeof(game_path)))
return false;
option_file = config_file_new(game_path);
if (!option_file)