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

(configuration.c) Cleanups

Browse Source
This commit is contained in:
twinaphex 2016-09-03 08:12:40 +02:00
parent 5613feafb6
commit 9bdca16884
1 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
configuration.c
View File

@ -560,13 +560,13 @@ static int populate_settings_path(settings_t *settings, struct config_path_setti
#ifdef HAVE_XMB #ifdef HAVE_XMB
SETTING_PATH("xmb_font", settings->menu.xmb.font, false, NULL, true); SETTING_PATH("xmb_font", settings->menu.xmb.font, false, NULL, true);
#endif #endif
SETTING_PATH("netplay_nickname", settings->username, false, NULL, false); SETTING_PATH("netplay_nickname", settings->username, false, NULL, true);
SETTING_PATH("video_filter", settings->path.softfilter_plugin, false, NULL, true); SETTING_PATH("video_filter", settings->path.softfilter_plugin, false, NULL, true);
SETTING_PATH("audio_dsp_plugin", settings->path.audio_dsp_plugin, false, NULL, true); SETTING_PATH("audio_dsp_plugin", settings->path.audio_dsp_plugin, false, NULL, true);
SETTING_PATH("core_updater_buildbot_url", settings->network.buildbot_url, false, NULL, true); SETTING_PATH("core_updater_buildbot_url", settings->network.buildbot_url, false, NULL, true);
SETTING_PATH("core_updater_buildbot_assets_url", settings->network.buildbot_assets_url, false, NULL, true); SETTING_PATH("core_updater_buildbot_assets_url", settings->network.buildbot_assets_url, false, NULL, true);
#ifdef HAVE_NETPLAY #ifdef HAVE_NETPLAY
SETTING_PATH("netplay_ip_address", global->netplay.server, false, NULL, false); SETTING_PATH("netplay_ip_address", global->netplay.server, false, NULL, true);
#endif #endif
SETTING_PATH("recording_output_directory", SETTING_PATH("recording_output_directory",
global->record.output_dir, false, NULL, true); global->record.output_dir, false, NULL, true);
@ -1650,6 +1650,8 @@ static bool config_load_file(const char *path, bool set_defaults,
struct config_bool_setting_ptr *bool_settings = NULL; struct config_bool_setting_ptr *bool_settings = NULL;
struct config_array_setting_ptr *array_settings = NULL; struct config_array_setting_ptr *array_settings = NULL;
struct config_path_setting_ptr *path_settings = NULL; struct config_path_setting_ptr *path_settings = NULL;
char *override_username = NULL;
char *override_netplay_ip_address = NULL;
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
int bool_settings_size = populate_settings_bool (settings, &bool_settings); int bool_settings_size = populate_settings_bool (settings, &bool_settings);
int float_settings_size = populate_settings_float (settings, &float_settings); int float_settings_size = populate_settings_float (settings, &float_settings);
@ -1695,6 +1697,16 @@ static bool config_load_file(const char *path, bool set_defaults,
} }
#endif #endif
/* Overrides */
if (rarch_ctl(RARCH_CTL_HAS_SET_USERNAME, NULL))
override_username = strdup(settings->username);
#ifdef HAVE_NETPLAY
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS))
override_netplay_ip_address = strdup(global->netplay.server);
#endif
/* Boolean settings */ /* Boolean settings */
for (i = 0; i < bool_settings_size; i++) for (i = 0; i < bool_settings_size; i++)
@ -1854,25 +1866,26 @@ static bool config_load_file(const char *path, bool set_defaults,
config_set_active_core_path(tmp_str); config_set_active_core_path(tmp_str);
#endif #endif
if (!rarch_ctl(RARCH_CTL_HAS_SET_USERNAME, NULL))
{
if (config_get_path(conf, "netplay_nickname", tmp_str, sizeof(tmp_str)))
strlcpy(settings->username, tmp_str, sizeof(settings->username));
}
#ifdef HAVE_NETPLAY
if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS))
{
if (config_get_path(conf, "netplay_ip_address", tmp_str, sizeof(tmp_str)))
strlcpy(global->netplay.server, tmp_str, sizeof(global->netplay.server));
}
#endif
#ifdef RARCH_CONSOLE #ifdef RARCH_CONSOLE
video_driver_load_settings(conf); video_driver_load_settings(conf);
#endif #endif
/* Post-settings load */ /* Post-settings load */
if (rarch_ctl(RARCH_CTL_HAS_SET_USERNAME, NULL) && override_username)
{
strlcpy(settings->username, override_username, sizeof(settings->username));
free(override_username);
}
#ifdef HAVE_NETPLAY
if (retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_NETPLAY_IP_ADDRESS))
{
strlcpy(global->netplay.server, override_netplay_ip_address, sizeof(global->netplay.server));
free(override_netplay_ip_address);
}
#endif
if (settings->video.hard_sync_frames > 3) if (settings->video.hard_sync_frames > 3)
settings->video.hard_sync_frames = 3; settings->video.hard_sync_frames = 3;