From 3fdc0df089a33dc88f024a73105b739d49dcd0a7 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 28 Jul 2014 03:28:27 +0200 Subject: [PATCH] Rename g_settings.game_history_path to g_settings.content_history_path --- frontend/menu/backend/menu_common_backend.c | 4 ++-- frontend/menu/menu_common.c | 4 ++-- general.h | 2 +- settings.c | 8 ++++---- settings_data.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/frontend/menu/backend/menu_common_backend.c b/frontend/menu/backend/menu_common_backend.c index 191ebc4e12..f8c595d03d 100644 --- a/frontend/menu/backend/menu_common_backend.c +++ b/frontend/menu/backend/menu_common_backend.c @@ -3698,7 +3698,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action) driver.menu->need_refresh = true; break; case MENU_ACTION_START: - *g_settings.game_history_path = '\0'; + *g_settings.content_history_path = '\0'; break; default: break; @@ -4931,7 +4931,7 @@ static void menu_common_setting_set_label(char *type_str, size_t type_str_size, break; #endif case MENU_SETTINGS_CONTENT_HISTORY_PATH: - strlcpy(type_str, g_settings.game_history_path ? g_settings.game_history_path : "", type_str_size); + strlcpy(type_str, g_settings.content_history_path ? g_settings.content_history_path : "", type_str_size); break; case MENU_SETTINGS_BIND_PLAYER: snprintf(type_str, type_str_size, "#%d", driver.menu->current_pad + 1); diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c index 78b5010e85..f02018840d 100644 --- a/frontend/menu/menu_common.c +++ b/frontend/menu/menu_common.c @@ -218,7 +218,7 @@ bool load_menu_content(void) if (g_extern.history) content_history_free(g_extern.history); - g_extern.history = content_history_init(g_settings.game_history_path, g_settings.game_history_size); + g_extern.history = content_history_init(g_settings.content_history_path, g_settings.game_history_size); if (driver.menu_ctx && driver.menu_ctx->backend && driver.menu_ctx->backend->shader_manager_init) driver.menu_ctx->backend->shader_manager_init(driver.menu); @@ -264,7 +264,7 @@ void *menu_init(const void *data) if (menu_ctx && menu_ctx->backend && menu_ctx->backend->shader_manager_init) menu_ctx->backend->shader_manager_init(menu); - g_extern.history = content_history_init(g_settings.game_history_path, g_settings.game_history_size); + g_extern.history = content_history_init(g_settings.content_history_path, g_settings.game_history_size); menu->last_time = rarch_get_time_usec(); return menu; diff --git a/general.h b/general.h index 40bd2be9e1..d958bf1073 100644 --- a/general.h +++ b/general.h @@ -309,7 +309,7 @@ struct settings } input; char core_options_path[PATH_MAX]; - char game_history_path[PATH_MAX]; + char content_history_path[PATH_MAX]; unsigned game_history_size; char libretro[PATH_MAX]; diff --git a/settings.c b/settings.c index 445f823f0a..f7bf23cee8 100644 --- a/settings.c +++ b/settings.c @@ -434,7 +434,7 @@ void config_set_defaults(void) *g_settings.libretro_directory = '\0'; *g_settings.core_options_path = '\0'; - *g_settings.game_history_path = '\0'; + *g_settings.content_history_path = '\0'; *g_settings.cheat_database = '\0'; *g_settings.cheat_settings_path = '\0'; *g_settings.screenshot_directory = '\0'; @@ -510,7 +510,7 @@ void config_set_defaults(void) if (*g_defaults.config_path) fill_pathname_expand_special(g_extern.config_path, g_defaults.config_path, sizeof(g_extern.config_path)); - fill_pathname_resolve_relative(g_settings.game_history_path, g_extern.config_path, ".retroarch-game-history.txt", sizeof(g_settings.game_history_path)); + fill_pathname_resolve_relative(g_settings.content_history_path, g_extern.config_path, ".retroarch-game-history.txt", sizeof(g_settings.content_history_path)); g_extern.config_save_on_exit = config_save_on_exit; @@ -1084,7 +1084,7 @@ bool config_load_file(const char *path, bool set_defaults) CONFIG_GET_BOOL(stdin_cmd_enable, "stdin_cmd_enable"); if (config_get_path(conf, "game_history_path", tmp_str, sizeof(tmp_str))) - strlcpy(g_settings.game_history_path, tmp_str, sizeof(g_settings.game_history_path)); + strlcpy(g_settings.content_history_path, tmp_str, sizeof(g_settings.content_history_path)); CONFIG_GET_INT(game_history_size, "game_history_size"); CONFIG_GET_INT(input.turbo_period, "input_turbo_period"); @@ -1422,7 +1422,7 @@ bool config_save_file(const char *path) config_set_bool(conf, "rgui_show_start_screen", g_settings.menu_show_start_screen); #endif - config_set_path(conf, "game_history_path", g_settings.game_history_path); + config_set_path(conf, "game_history_path", g_settings.content_history_path); config_set_int(conf, "game_history_size", g_settings.game_history_size); config_set_path(conf, "joypad_autoconfig_dir", g_settings.input.autoconfig_dir); config_set_bool(conf, "input_autodetect_enable", g_settings.input.autodetect_enable); diff --git a/settings_data.c b/settings_data.c index 10cd40be7f..666d9b7063 100644 --- a/settings_data.c +++ b/settings_data.c @@ -930,7 +930,7 @@ static void general_read_handler(const void *data) else if (!strcmp(setting->name, "cheat_settings_path")) strlcpy(setting->value.string, g_settings.cheat_settings_path, setting->size); else if (!strcmp(setting->name, "game_history_path")) - strlcpy(setting->value.string, g_settings.game_history_path, setting->size); + strlcpy(setting->value.string, g_settings.content_history_path, setting->size); else if (!strcmp(setting->name, "video_shader_dir")) strlcpy(setting->value.string, g_settings.video.shader_dir, setting->size); else if (!strcmp(setting->name, "video_aspect_ratio_auto")) @@ -1277,7 +1277,7 @@ static void general_write_handler(const void *data) else if (!strcmp(setting->name, "cheat_settings_path")) strlcpy(g_settings.cheat_settings_path, setting->value.string, sizeof(g_settings.cheat_settings_path)); else if (!strcmp(setting->name, "game_history_path")) - strlcpy(g_settings.game_history_path, setting->value.string, sizeof(g_settings.game_history_path)); + strlcpy(g_settings.content_history_path, setting->value.string, sizeof(g_settings.content_history_path)); else if (!strcmp(setting->name, "video_shader_dir")) strlcpy(g_settings.video.shader_dir, setting->value.string, sizeof(g_settings.video.shader_dir)); else if (!strcmp(setting->name, "video_aspect_ratio_auto")) @@ -1654,7 +1654,7 @@ rarch_setting_t* setting_data_get_list(void) CONFIG_PATH(g_settings.core_options_path, "core_options_path", "Core Options Path", "", "Paths", SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) CONFIG_PATH(g_settings.cheat_database, "cheat_database_path", "Cheat Database", "", "Paths", SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) CONFIG_PATH(g_settings.cheat_settings_path, "cheat_settings_path", "Cheat Settings", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) - CONFIG_PATH(g_settings.game_history_path, "game_history_path", "Content History Path", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) + CONFIG_PATH(g_settings.content_history_path, "game_history_path", "Content History Path", "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY) CONFIG_PATH(g_settings.video.shader_dir, "video_shader_dir", "Shader Directory", g_defaults.shader_dir ? g_defaults.shader_dir : "", GROUP_NAME, SUBGROUP_NAME, general_write_handler, general_read_handler) WITH_FLAGS(SD_FLAG_ALLOW_EMPTY | SD_FLAG_PATH_DIR)