mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 15:45:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorder g_defaults, alignment

Browse Source
This commit is contained in:
twinaphex 2020-08-16 04:38:02 +02:00
parent 1b4cbf3ed5
commit 855351de9e
18 changed files with 89 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
configuration.c
View File

@ -1131,8 +1131,8 @@ const char *config_get_default_menu(void)
#ifdef HAVE_MENU
enum menu_driver_enum default_driver = MENU_DEFAULT_DRIVER;
if (!string_is_empty(g_defaults.settings.menu))
return g_defaults.settings.menu;
if (!string_is_empty(g_defaults.settings_menu))
return g_defaults.settings_menu;
switch (default_driver)
{
@ -1178,8 +1178,8 @@ const char *config_get_midi_driver_options(void)
bool config_overlay_enable_default(void)
{
if (g_defaults.overlay.set)
return g_defaults.overlay.enable;
if (g_defaults.overlay_set)
return g_defaults.overlay_enable;
return true;
}
@ -2234,8 +2234,8 @@ void config_set_defaults(void *data)
#ifdef HAVE_MATERIALUI
if (g_defaults.menu.materialui.menu_color_theme_enable)
settings->uints.menu_materialui_color_theme = g_defaults.menu.materialui.menu_color_theme;
if (g_defaults.menu_materialui_menu_color_theme_enable)
settings->uints.menu_materialui_color_theme = g_defaults.menu_materialui_menu_color_theme;
#endif
#endif
@ -2247,19 +2247,19 @@ void config_set_defaults(void *data)
settings->floats.video_msg_color_g = ((message_color >> 8) & 0xff) / 255.0f;
settings->floats.video_msg_color_b = ((message_color >> 0) & 0xff) / 255.0f;
if (g_defaults.settings.video_refresh_rate > 0.0 &&
g_defaults.settings.video_refresh_rate != DEFAULT_REFRESH_RATE)
settings->floats.video_refresh_rate = g_defaults.settings.video_refresh_rate;
if (g_defaults.settings_video_refresh_rate > 0.0 &&
g_defaults.settings_video_refresh_rate != DEFAULT_REFRESH_RATE)
settings->floats.video_refresh_rate = g_defaults.settings_video_refresh_rate;
if (DEFAULT_AUDIO_DEVICE)
configuration_set_string(settings,
settings->arrays.audio_device,
DEFAULT_AUDIO_DEVICE);
if (!g_defaults.settings.out_latency)
g_defaults.settings.out_latency = DEFAULT_OUT_LATENCY;
if (!g_defaults.settings_out_latency)
g_defaults.settings_out_latency = DEFAULT_OUT_LATENCY;
settings->uints.audio_latency = g_defaults.settings.out_latency;
settings->uints.audio_latency = g_defaults.settings_out_latency;
audio_set_float(AUDIO_ACTION_VOLUME_GAIN, settings->floats.audio_volume);
#ifdef HAVE_AUDIOMIXER
@ -2444,12 +2444,12 @@ void config_set_defaults(void *data)
g_defaults.dirs[DEFAULT_DIR_SHADER],
sizeof(settings->paths.directory_video_shader));
if (!string_is_empty(g_defaults.path.buildbot_server_url))
if (!string_is_empty(g_defaults.path_buildbot_server_url))
configuration_set_string(settings,
settings->paths.network_buildbot_url,
g_defaults.path.buildbot_server_url);
if (!string_is_empty(g_defaults.path.core))
path_set(RARCH_PATH_CORE, g_defaults.path.core);
g_defaults.path_buildbot_server_url);
if (!string_is_empty(g_defaults.path_core))
path_set(RARCH_PATH_CORE, g_defaults.path_core);
if (!string_is_empty(g_defaults.dirs[DEFAULT_DIR_DATABASE]))
configuration_set_string(settings,
settings->paths.path_content_database,
@ -2546,14 +2546,14 @@ void config_set_defaults(void *data)
settings->paths.log_dir,
g_defaults.dirs[DEFAULT_DIR_LOGS]);
if (!string_is_empty(g_defaults.path.config))
if (!string_is_empty(g_defaults.path_config))
{
char *temp_str = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
temp_str[0] = '\0';
fill_pathname_expand_special(temp_str,
g_defaults.path.config,
g_defaults.path_config,
PATH_MAX_LENGTH * sizeof(char));
path_set(RARCH_PATH_CONFIG, temp_str);
free(temp_str);

61
defaults.h
View File

@ -65,46 +65,6 @@ enum default_dirs
struct defaults
{
#ifdef HAVE_MENU
struct
{
struct
{
bool menu_color_theme_enable;
unsigned menu_color_theme;
} materialui;
struct
{
bool set;
unsigned menu_btn_ok;
unsigned menu_btn_cancel;
} controls;
} menu;
#endif
struct
{
bool set;
bool enable;
} overlay;
char dirs [DEFAULT_DIR_LAST + 1][PATH_MAX_LENGTH];
struct
{
char config[PATH_MAX_LENGTH];
char core[PATH_MAX_LENGTH];
char buildbot_server_url[255];
} path;
struct
{
int out_latency;
float video_refresh_rate;
char menu[32];
} settings;
#ifndef IS_SALAMANDER
playlist_t *content_history;
playlist_t *content_favorites;
@ -116,6 +76,27 @@ struct defaults
playlist_t *video_history;
#endif
#endif
int settings_out_latency;
#ifdef HAVE_MENU
unsigned menu_materialui_menu_color_theme;
#endif
float settings_video_refresh_rate;
char dirs [DEFAULT_DIR_LAST + 1][PATH_MAX_LENGTH];
char path_config[PATH_MAX_LENGTH];
char path_core [PATH_MAX_LENGTH];
char path_buildbot_server_url[255];
char settings_menu[32];
#ifdef HAVE_MENU
bool menu_materialui_menu_color_theme_enable;
bool menu_controls_menu_btn_ok;
bool menu_controls_menu_btn_cancel;
bool menu_controls_set;
#endif
bool overlay_set;
bool overlay_enable;
};
bool dir_set_defaults(enum default_dirs dir_type, const char *dirpath);

4
frontend/drivers/platform_ctr.c
View File

@ -124,8 +124,8 @@ static void frontend_ctr_get_environment_settings(int* argc, char* argv[],
"database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_PORT],
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
}
static void frontend_ctr_deinit(void* data)

2
frontend/drivers/platform_darwin.m
View File

@ -459,7 +459,7 @@ static void frontend_darwin_get_environment_settings(int *argc, char *argv[],
char assets_zip_path[PATH_MAX_LENGTH];
#if TARGET_OS_IOS
if (major > 8)
strlcpy(g_defaults.path.buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path.buildbot_server_url));
strlcpy(g_defaults.path_buildbot_server_url, "http://buildbot.libretro.com/nightly/apple/ios9/latest/", sizeof(g_defaults.path_buildbot_server_url));
#endif
fill_pathname_join(assets_zip_path, bundle_path_buf, "assets.zip", sizeof(assets_zip_path));

4
frontend/drivers/platform_emscripten.c
View File

@ -148,8 +148,8 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
/* history and main config */
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
for (i = 0; i < DEFAULT_DIR_LAST; i++)
{

4
frontend/drivers/platform_gx.c
View File

@ -235,8 +235,8 @@ static void frontend_gx_get_environment_settings(
"cheats", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
/* User paths */
fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT],
"retroarch.cfg", sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
"retroarch.cfg", sizeof(g_defaults.path_config));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], g_defaults.dirs[DEFAULT_DIR_PORT],
"system", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], g_defaults.dirs[DEFAULT_DIR_PORT],

4
frontend/drivers/platform_orbis.c
View File

@ -177,8 +177,8 @@ static void frontend_orbis_get_environment_settings(int *argc, char *argv[],
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
#ifndef IS_SALAMANDER
params = (struct rarch_main_wrap*)params_data;

4
frontend/drivers/platform_ps2.c
View File

@ -83,8 +83,8 @@ static void create_path_names(void)
/* history and main config */
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
}
static void poweroffCallback(void *arg)

4
frontend/drivers/platform_ps3.c
View File

@ -132,8 +132,8 @@ static void fill_derived_paths(void)
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SHADER],
g_defaults.dirs[DEFAULT_DIR_CORE],
"shaders_cg", sizeof(g_defaults.dirs[DEFAULT_DIR_SHADER]));
fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_OVERLAY],
g_defaults.dirs[DEFAULT_DIR_CORE],
"overlays", sizeof(g_defaults.dirs[DEFAULT_DIR_OVERLAY]));

8
frontend/drivers/platform_psp.c
View File

@ -145,8 +145,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
#else
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT],
@ -183,8 +183,8 @@ static void frontend_psp_get_environment_settings(int *argc, char *argv[],
/* history and main config */
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
#endif
#ifndef IS_SALAMANDER

6
frontend/drivers/platform_qnx.c
View File

@ -138,8 +138,8 @@ static void frontend_qnx_get_environment_settings(int *argc, char *argv[],
/* history and main config */
strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
fill_pathname_join(g_defaults.path.config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, user_path,
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
/* bundle copy */
snprintf(data_assets_path,
@ -170,7 +170,7 @@ static void frontend_qnx_get_environment_settings(int *argc, char *argv[],
}
/* set glui as default menu */
snprintf(g_defaults.settings.menu, sizeof(g_defaults.settings.menu), "glui");
snprintf(g_defaults.settings_menu, sizeof(g_defaults.settings_menu), "glui");
}
enum frontend_architecture frontend_qnx_get_architecture(void)

4
frontend/drivers/platform_switch.c
View File

@ -272,10 +272,10 @@ static void frontend_switch_get_environment_settings(
path_mkdir(dir_path);
}
fill_pathname_join(g_defaults.path.config,
fill_pathname_join(g_defaults.path_config,
g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG),
sizeof(g_defaults.path.config));
sizeof(g_defaults.path_config));
}
static void frontend_switch_deinit(void *data)

26
frontend/drivers/platform_unix.c
View File

@ -1687,29 +1687,29 @@ static void frontend_unix_get_env(int *argc,
/* Set automatic default values per device */
if (device_is_xperia_play(device_model))
g_defaults.settings.out_latency = 128;
g_defaults.settings_out_latency = 128;
else if (strstr(device_model, "GAMEMID_BT"))
g_defaults.settings.out_latency = 160;
g_defaults.settings_out_latency = 160;
else if (strstr(device_model, "SHIELD"))
{
g_defaults.settings.video_refresh_rate = 60.0;
g_defaults.settings_video_refresh_rate = 60.0;
#ifdef HAVE_MENU
#ifdef HAVE_MATERIALUI
g_defaults.menu.materialui.menu_color_theme_enable = true;
g_defaults.menu.materialui.menu_color_theme = MATERIALUI_THEME_NVIDIA_SHIELD;
g_defaults.menu_materialui_menu_color_theme_enable = true;
g_defaults.menu_materialui_menu_color_theme = MATERIALUI_THEME_NVIDIA_SHIELD;
#endif
#endif
#if 0
/* Set the OK/cancel menu buttons to the default
* ones used for Shield */
g_defaults.menu.controls.set = true;
g_defaults.menu.controls.menu_btn_ok = RETRO_DEVICE_ID_JOYPAD_B;
g_defaults.menu.controls.menu_btn_cancel = RETRO_DEVICE_ID_JOYPAD_A;
g_defaults.menu_controls_set = true;
g_defaults.menu_controls_menu_btn_ok = RETRO_DEVICE_ID_JOYPAD_B;
g_defaults.menu_controls_menu_btn_cancel = RETRO_DEVICE_ID_JOYPAD_A;
#endif
}
else if (strstr(device_model, "JSS15J"))
g_defaults.settings.video_refresh_rate = 59.65;
g_defaults.settings_video_refresh_rate = 59.65;
/* For gamepad-like/console devices:
*
@ -1720,10 +1720,10 @@ static void frontend_unix_get_env(int *argc,
if (device_is_game_console(device_model) || device_is_android_tv())
{
g_defaults.overlay.set = true;
g_defaults.overlay.enable = false;
strlcpy(g_defaults.settings.menu, "ozone",
sizeof(g_defaults.settings.menu));
g_defaults.overlay_set = true;
g_defaults.overlay_enable = false;
strlcpy(g_defaults.settings_menu, "ozone",
sizeof(g_defaults.settings_menu));
}
#else
char base_path[PATH_MAX] = {0};

8
frontend/drivers/platform_uwp.c
View File

@ -392,13 +392,13 @@ static void frontend_uwp_environment_get(int *argc, char *argv[],
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(HAVE_OPENGL_CORE)
if (string_is_equal(uwp_device_family, "Windows.Mobile"))
{
snprintf(g_defaults.settings.menu,
sizeof(g_defaults.settings.menu), "glui");
snprintf(g_defaults.settings_menu,
sizeof(g_defaults.settings_menu), "glui");
}
else
{
snprintf(g_defaults.settings.menu,
sizeof(g_defaults.settings.menu), "xmb");
snprintf(g_defaults.settings_menu,
sizeof(g_defaults.settings_menu), "xmb");
}
#endif
#endif

4
frontend/drivers/platform_wiiu.c
View File

@ -133,8 +133,8 @@ static void frontend_wiiu_get_environment_settings(int *argc, char *argv[],
"database/cursors", sizeof(g_defaults.dirs[DEFAULT_DIR_CURSOR]));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_LOGS], g_defaults.dirs[DEFAULT_DIR_CORE],
"logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS]));
fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_PORT],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
for (i = 0; i < DEFAULT_DIR_LAST; i++)
{

8
frontend/drivers/platform_xdk.c
View File

@ -101,8 +101,8 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
#if defined(_XBOX1)
strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE],
"D:", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
fill_pathname_join(g_defaults.path.config, g_defaults.dirs[DEFAULT_DIR_CORE],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
fill_pathname_join(g_defaults.path_config, g_defaults.dirs[DEFAULT_DIR_CORE],
file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path_config));
fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE],
g_defaults.dirs[DEFAULT_DIR_CORE],
"savestates",
@ -145,8 +145,8 @@ static void frontend_xdk_get_environment_settings(int *argc, char *argv[],
strlcpy(g_defaults.dirs[DEFAULT_DIR_CORE],
"game:",
sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
strlcpy(g_defaults.path.config,
"game:\\retroarch.cfg", sizeof(g_defaults.path.config));
strlcpy(g_defaults.path_config,
"game:\\retroarch.cfg", sizeof(g_defaults.path_config));
strlcpy(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT],
"game:",
sizeof(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT]));

6
frontend/frontend_salamander.c
View File

@ -118,12 +118,12 @@ static void find_and_set_first_file(char *s, size_t len,
static void salamander_init(char *s, size_t len)
{
/* normal executable loading path */
bool config_exists = config_file_exists(g_defaults.path.config);
bool config_exists = config_file_exists(g_defaults.path_config);
if (config_exists)
{
char tmp_str[PATH_MAX_LENGTH] = {0};
config_file_t * conf = config_file_new(g_defaults.path.config);
config_file_t * conf = config_file_new(g_defaults.path_config);
if (conf)
{
@ -161,7 +161,7 @@ static void salamander_init(char *s, size_t len)
if (conf)
{
config_set_string(conf, "libretro_path", s);
config_file_write(conf, g_defaults.path.config, true);
config_file_write(conf, g_defaults.path_config, true);
config_file_free(conf);
}
}

4
menu/menu_setting.c
View File

@ -11144,8 +11144,8 @@ static bool setting_append_list(
&settings->uints.audio_latency,
MENU_ENUM_LABEL_AUDIO_LATENCY,
MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
g_defaults.settings.out_latency ?
g_defaults.settings.out_latency : DEFAULT_OUT_LATENCY,
g_defaults.settings_out_latency ?
g_defaults.settings_out_latency : DEFAULT_OUT_LATENCY,
&group_info,
&subgroup_info,
parent_group,