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

Start passing global struct to configuration.c functions

Browse Source
This commit is contained in:
twinaphex 2019-11-18 07:32:01 +01:00
parent 88d4ae6790
commit a68e9b5014
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
configuration.c
View File

@ -1952,12 +1952,13 @@ static struct config_int_setting *populate_settings_int(settings_t *settings, in
* *
* Set 'default' configuration values. * Set 'default' configuration values.
**/ **/
void config_set_defaults(void) void config_set_defaults(void *data)
{ {
unsigned i, j; unsigned i, j;
#ifdef HAVE_MENU #ifdef HAVE_MENU
static bool first_initialized = true; static bool first_initialized = true;
#endif #endif
global_t *global = (global_t*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
int bool_settings_size = sizeof(settings->bools) / sizeof(settings->bools.placeholder); int bool_settings_size = sizeof(settings->bools) / sizeof(settings->bools.placeholder);
int float_settings_size = sizeof(settings->floats) / sizeof(settings->floats.placeholder); int float_settings_size = sizeof(settings->floats) / sizeof(settings->floats.placeholder);
@ -2216,14 +2217,10 @@ void config_set_defaults(void)
rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL); rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL);
rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL); rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);
if (global)
{ {
global_t *global = global_get_ptr(); *global->record.output_dir = '\0';
*global->record.config_dir = '\0';
if (global)
{
*global->record.output_dir = '\0';
*global->record.config_dir = '\0';
}
} }
*settings->paths.path_core_options = '\0'; *settings->paths.path_core_options = '\0';
@ -2689,7 +2686,8 @@ static bool check_menu_driver_compatibility(void)
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
static bool config_load_file(const char *path, settings_t *settings) static bool config_load_file(global_t *global,
const char *path, settings_t *settings)
{ {
unsigned i; unsigned i;
size_t path_size = PATH_MAX_LENGTH * sizeof(char); size_t path_size = PATH_MAX_LENGTH * sizeof(char);
@ -3115,8 +3113,6 @@ static bool config_load_file(const char *path, settings_t *settings)
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
global_t *global = global_get_ptr();
dir_set(RARCH_DIR_SAVEFILE, tmp_str); dir_set(RARCH_DIR_SAVEFILE, tmp_str);
if (global) if (global)
@ -3140,8 +3136,6 @@ static bool config_load_file(const char *path, settings_t *settings)
dir_set(RARCH_DIR_SAVESTATE, g_defaults.dirs[DEFAULT_DIR_SAVESTATE]); dir_set(RARCH_DIR_SAVESTATE, g_defaults.dirs[DEFAULT_DIR_SAVESTATE]);
else if (path_is_directory(tmp_str)) else if (path_is_directory(tmp_str))
{ {
global_t *global = global_get_ptr();
dir_set(RARCH_DIR_SAVESTATE, tmp_str); dir_set(RARCH_DIR_SAVESTATE, tmp_str);
if (global) if (global)
@ -3384,7 +3378,8 @@ bool config_load_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(path_get(RARCH_PATH_CONFIG), config_get_ptr())) if (!config_load_file(global_get_ptr(),
path_get(RARCH_PATH_CONFIG), config_get_ptr()))
goto error; goto error;
/* Restore the libretro_path we're using /* Restore the libretro_path we're using
@ -3430,7 +3425,8 @@ bool config_unload_override(void)
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL);
retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL); retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL);
if (!config_load_file(path_get(RARCH_PATH_CONFIG), config_get_ptr())) if (!config_load_file(global_get_ptr(),
path_get(RARCH_PATH_CONFIG), config_get_ptr()))
return false; return false;
RARCH_LOG("[Overrides] configuration overrides unloaded, original configuration restored.\n"); RARCH_LOG("[Overrides] configuration overrides unloaded, original configuration restored.\n");
@ -3577,8 +3573,9 @@ success:
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
void config_parse_file(void) void config_parse_file(void *data)
{ {
global_t *global = (global_t*)data;
if (path_is_empty(RARCH_PATH_CONFIG)) if (path_is_empty(RARCH_PATH_CONFIG))
{ {
RARCH_LOG("[config] Loading default config.\n"); RARCH_LOG("[config] Loading default config.\n");
@ -3588,7 +3585,7 @@ void config_parse_file(void)
const char *config_path = path_get(RARCH_PATH_CONFIG); const char *config_path = path_get(RARCH_PATH_CONFIG);
RARCH_LOG("[config] loading config from: %s.\n", config_path); RARCH_LOG("[config] loading config from: %s.\n", config_path);
if (!config_load_file(config_path, config_get_ptr())) if (!config_load_file(global, config_path, config_get_ptr()))
{ {
RARCH_ERR("[config] couldn't find config at path: \"%s\"\n", RARCH_ERR("[config] couldn't find config at path: \"%s\"\n",
config_path); config_path);
@ -3602,10 +3599,11 @@ void config_parse_file(void)
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
void config_load(void) void config_load(void *data)
{ {
config_set_defaults(); global_t *global = (global_t*)data;
config_parse_file(); config_set_defaults(global);
config_parse_file(global);
} }
/** /**
@ -4036,7 +4034,8 @@ bool config_save_overrides(int override_type)
conf = config_file_new_alloc(); conf = config_file_new_alloc();
/* Load the original config file in memory */ /* Load the original config file in memory */
config_load_file(path_get(RARCH_PATH_CONFIG), settings); config_load_file(global_get_ptr(),
path_get(RARCH_PATH_CONFIG), settings);
bool_settings = populate_settings_bool(settings, &bool_settings_size); bool_settings = populate_settings_bool(settings, &bool_settings_size);
tmp_i = sizeof(settings->bools) / sizeof(settings->bools.placeholder); tmp_i = sizeof(settings->bools) / sizeof(settings->bools.placeholder);

4
configuration.h
View File

@ -807,7 +807,7 @@ const char *config_get_default_record(void);
* Loads a config file and reads all the values into memory. * Loads a config file and reads all the values into memory.
* *
*/ */
void config_parse_file(void); void config_parse_file(void *data);
/** /**
* config_load_override: * config_load_override:
@ -876,7 +876,7 @@ bool config_replace(bool config_save_on_exit, char *path);
bool config_overlay_enable_default(void); bool config_overlay_enable_default(void);
void config_set_defaults(void); void config_set_defaults(void *data);
settings_t *config_get_ptr(void); settings_t *config_get_ptr(void);

6
retroarch.c
View File

@ -6924,7 +6924,7 @@ TODO: Add a setting for these tweaks */
#endif #endif
break; break;
case CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG: case CMD_EVENT_MENU_RESET_TO_DEFAULT_CONFIG:
config_set_defaults(); config_set_defaults(&g_extern);
break; break;
case CMD_EVENT_MENU_SAVE_CURRENT_CONFIG: case CMD_EVENT_MENU_SAVE_CURRENT_CONFIG:
command_event_save_current_config(OVERRIDE_NONE); command_event_save_current_config(OVERRIDE_NONE);
@ -24093,8 +24093,8 @@ static void retroarch_parse_input_and_config(int argc, char *argv[])
/* Load the config file now that we know what it is */ /* Load the config file now that we know what it is */
if (!rarch_block_config_read) if (!rarch_block_config_read)
{ {
config_set_defaults(); config_set_defaults(&g_extern);
config_parse_file(); config_parse_file(&g_extern);
} }
/* Second pass: All other arguments override the config file */ /* Second pass: All other arguments override the config file */